release: bump version to 1.8.221.8.22

83 files changed, 134550 insertions, 111197 deletions

diff --git a/configure.ac b/configure.ac
index 6abbca8f..5f6a24c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.63])
 
 m4_define([nma_major_version], [1])
 m4_define([nma_minor_version], [8])
-m4_define([nma_micro_version], [21])
+m4_define([nma_micro_version], [22])
 m4_define([nma_version],
           [nma_major_version.nma_minor_version.nma_micro_version])
 
diff --git a/meson.build b/meson.build
index 5575ffdb..cf5d02f7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'network-manager-applet', 'c',
-  version: '1.8.21',
+  version: '1.8.22',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/po/af.po b/po/af.po
index 7024a0be..80e9d49f 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-04-04 08:18+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -19,39 +20,48 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0-beta4\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Bestuur u netwerkverbindings"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Netwerkverbindings"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktiewe netwerkverbindings"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Bestuur en verander u netwerkverbinding-instellings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Deaktiveer koppel-kennisgewings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer aan 'n netwerk gekoppel word te "
 "deaktiveer."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Deaktiveer ontkoppel-kennisgewings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -59,12 +69,12 @@ msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
 "deaktiveer."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Deaktiveer koppel-kennisgewings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -73,11 +83,11 @@ msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
 "deaktiveer."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Onderdruk netwerkebeskikbaar-kennisgewings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -85,21 +95,22 @@ msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer draadlose netwerke beskikbaar is "
 "te deaktiveer."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stempel"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Word gebruik om te bepaal of instellings na 'n nuwe weergawe migreer moet "
 "word."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Deaktiveer Wi-Fi-skep"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -107,160 +118,173 @@ msgstr ""
 "Stel na WAAR om skep van ad hoc-netwerke te deaktiveer wanneer die "
 "miniprogram gebruik word."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager-miniprogram"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Geen netwerkverbinding"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager-miniprogram"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "DSL-magtiging"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Verbind"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Netwerk-naam:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Geen geldige aktiewe verbindings gevind nie!"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "Onbekend"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "ontkoppel"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Geontkoppel"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Moenie weer hierdie boodskap wys nie"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -271,7 +295,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het ontkoppel, want die netwerk verbinding was "
 "onderbreek."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +306,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het misluk, want die netwerk verbinding was "
 "onderbreek."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -291,7 +315,7 @@ msgstr ""
 "\n"
 "Die VPN-verbinding '%s' het misluk, want die VPN-diens het onverwags gestop."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,7 +326,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het misluk, want die VPN-diens het ongeldige "
 "konfigurasie teruggestuur."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -311,7 +335,7 @@ msgstr ""
 "\n"
 "Die VPN-verbinding '%s' het misluk, want die verbindingspoging het uitgetel."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -321,7 +345,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het misluk, want die VPN-diens het nie betyds begin "
 "nie."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -330,7 +354,7 @@ msgstr ""
 "\n"
 "Die VPN-verbinding '%s' het misluk, want die VPN-diens kon nie begin nie."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -340,7 +364,7 @@ msgstr ""
 "Die VPN-verbinding '%s' het misluk, want daar was geen geldige VPN-geheime "
 "nie."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -349,7 +373,7 @@ msgstr ""
 "\n"
 "Die VPN-verbinding '%s' het misluk as gevolg van ongeldige VPN-geheime."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -358,7 +382,7 @@ msgstr ""
 "\n"
 "Die VPN-verbinding '%s' het misluk."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -366,19 +390,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN-aanmeldboodskap"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,7 +415,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -404,582 +428,607 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "toestel nie gereed nie (vermiste fermware)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "toestel nie gereed nie"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ontkoppel"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Ontkoppel"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "toestel word nie bestuur nie"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Geen netwerktoestelle beskikbaar nie"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-verbindings"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Stel VPN op..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN-verbindings"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager loop nie tans nie..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Netwerke gedeaktiveer"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Aktiveer _netwerke"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Aktiveer _draadloos"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Aktiveer _selfoonbreëband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Aktiveer _kennisgewings"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Verbindingsinligting"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Redigeer verbindings..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Aangaande"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "U is nou verbind aan '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Geontkoppel"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Die netwerkverbinding is ontkoppel."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Berei tans netwerkverbinding '%s' voor..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Gebruikersmagtiging vereis vir netwerkverbinding '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Vra tans 'n netwerkadres aan vir '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Netwerkverbinding '%s' is aktief"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Begin tans VPN-verbinding '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Gebruikersmagtiging vereis vir VPN-verbinding '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Vra tans 'n VPN-adres aan vir '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-verbinding '%s' is aktief"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager-miniprogram"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Verkeerde PUK-kode. Kontak asseblief u verskaffer."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Verkeerde PIN-kode. Kontak asseblief u verskaffer."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Stuur tans ontsluitkode..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Selfoonbreëband (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Selfoonbreëband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Beskikbaar"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Nuwe selfoon-breëbandverbinding"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Verbinding bewerkstellig"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "U is nou aan die selfoon-breëbandnetwerk verbind."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Selfoon-breëbandnetwerk-wagwoord"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "U is nou aan die draadnetwerk verbind."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "U is nou aan die draadnetwerk verbind."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "U is nou aan die selfoon-breëbandnetwerk verbind."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Berei tans selfoon-breëbandverbinding '%s' voor..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Konfigureer tans selfoon-breëbandverbinding '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Gebruikersmagtiging vereis vir selfoon-breëbandverbinding '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Selfoon-breëbandverbinding '%s' is aktief"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Outo-Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Draadnetwerke (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Draadnetwerk (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Draadnetwerke"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Draadnetwerk"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "U is nou aan die draadnetwerk verbind."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Berei tans draadnetwerkverbinding '%s' voor..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Konfigureer tans draadnetwerkverbinding '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Gebruikersmagtiging vereis vir draadnetwerkverbinding '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Vra tans 'n draadnetwerkadres aan vir '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Draadnetwerkverbinding '%s' is aktief"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-magtiging"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Verbind aan verskuilde draadlose netwerk"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Skep nuwe draadlose netwerk"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Draadnetwerke (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Draadnetwerk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Draadnetwerk"
 msgstr[1] "Draadnetwerk"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX is gedeaktiveer"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX is gedeaktiveer deur 'n hardewareskakelaar"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Meer netwerke"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Draadlose netwerke beskikbaar"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Gebruik die netwerk-kieslys om aan 'n draadlose netwerk te verbind"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "U is nou aan die draadlose netwerk verbind '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Berei tans netwerkverbinding '%s' voor..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigureer tans draadnetwerkverbinding '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Vra tans 'n netwerkadres aan vir '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Draadlosenetwerkverbinding '%s' is aktief: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Draadnetwerkverbinding '%s' is aktief"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Geen geldige aktiewe verbindings gevind nie!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 #, fuzzy
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 #, fuzzy
 msgid "Dynamic WEP"
 msgstr "Dinamiese-WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresse"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "Verstek"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u MG/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Uitsaai-adres"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnetmasker"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Eerste DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Tweede DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Derde DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Algemeen"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Koppelvlak"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardeware-adres"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drywer"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Spoed"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sekuriteit:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Verstekroete"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Geïgnoreer"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Wagwoord:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr ""
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "Gebr_uikernaam:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Verbi_nding:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 #, fuzzy
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Geen geldige aktiewe verbindings gevind nie!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -987,17 +1036,21 @@ msgstr ""
 "Kopiereg © 2005-2008 Novell, Inc.\n"
 "en baie ander gemeenskapsbydraers en vertalers"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Kennisgewingarea-miniprogram om u netwerktoestelle en verbindings te bestuur."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager-webwerf"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1005,33 +1058,33 @@ msgstr ""
 "Die NetworkManager-miniprogram kon party vereiste hulpbronne (die .ui-lêer) "
 "nie vind nie."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Vermiste hulpbronne"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Selfoon-breëbandnetwerk-wagwoord"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'n Wagwoord word benodig om aan '%s' te verbind."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-ontsluit vereis"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-ontsluit vereis"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1041,25 +1094,25 @@ msgstr ""
 "kan word."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Wys PIN-kode"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-ontsluit vereis"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK-ontsluit vereis"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1069,35 +1122,42 @@ msgstr ""
 "kan word."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nuwe PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Sleutel nuwe PIN-kode weer in:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Wys PIN/PUK-kodes"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Verbindingsinligting"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Geen geldige aktiewe verbindings gevind nie!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1106,56 +1166,56 @@ msgstr ""
 "IP-adresse identifiseer u rekenaar op die netwerk. Kliek die \"Voeg by\"-"
 "knoppie om 'n IP-adres by te voeg."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "S_kep"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1163,643 +1223,794 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Dien_s:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Uitsaai-adres:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Verbi_nding:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Koppelvlak:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Eerste DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
-msgstr ""
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
+msgstr "Eerste DNS:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Verbi_nding:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Aktiveer _netwerke"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "outomaties"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "IP-adres:"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardeware-adres:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Enige toetstel"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Kon nie verbindinggeheime opdateer nie, as gevolg van 'n onbekende fout."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Gebr_uikernaam:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "Dien_s:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Wys wagwoord"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "W_agwoord:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Koppelvlak"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Koppelvlak:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Koppelvlak:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Outomaties"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "Dien_s:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
-msgstr ""
+msgid "C_loned MAC address"
+msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Verstek"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Geïgnoreer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Uitsaai-adres:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
+msgstr "_Wys wagwoord"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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 ""
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
+msgstr "Spoed"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Geen"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "U is nou aan die draadnetwerk verbind."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Verbindingsinligting"
+msgid "_Metered connection"
+msgstr "Verbi_nding:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1808,7 +2019,7 @@ msgstr ""
 "IP-adresse identifiseer u rekenaar op die netwerk. Kliek die \"Voeg by\"-"
 "knoppie om 'n IP-adres by te voeg."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1816,134 +2027,136 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_Verbind"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Dien_s:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Outomaties met handmatige DNS-instellings"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+msgid "_Method"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1951,1243 +2164,1392 @@ msgstr ""
 "Domeine gebruik wanneer gasheername opgelos word. Gebruik kommas om "
 "veelvuldige domeine te skei."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP-kliënt-ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
-msgstr ""
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
+msgstr "Netwerk"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+msgid "Allowed methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Geen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+msgid "Method"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Draadnetwerke"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 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
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
+msgid "_LACP port priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Koppelvlak:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Verbi_nding:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Outo-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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Hardeware-adres:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Hardeware-adres:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Koppelvlak:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Koppelvlak:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
+msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Sekuriteit:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "onbekend"
-
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Hardeware-adres:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-verbindings"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Verbinding bewerkstellig"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
-msgstr ""
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
+msgstr "VPN-verbinding het misluk"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "etiket"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "etiket"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Verbinding bewerkstellig"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk."
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk."
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Geen netwerkverbinding"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Geen netwerkverbinding"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Verbinding bewerkstellig"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Netwerkverbindings"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN-verbindings"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Aktiveer _netwerke"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Draadlose netwerk"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Eerste DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Begin tans VPN-verbinding '%s'..."
@@ -3195,86 +3557,90 @@ msgstr "Begin tans VPN-verbinding '%s'..."
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Koppelvlak:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Geïgnoreer"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Geen netwerkverbinding"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Verstek"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3282,269 +3648,266 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-instellings"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-instellings"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "VPN-verbinding het misluk"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr ""
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr ""
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-instellings"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr ""
@@ -3554,177 +3917,175 @@ msgstr ""
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Enige toetstel"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "VPN-verbinding het misluk"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Sekuriteit:"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3736,209 +4097,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "_VPN-verbindings"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Ontsl_uit"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Verbindingsinligting"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktiewe netwerkverbindings"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "W_agwoord:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
-#, c-format
-msgid "%s _certificate:"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Die selfoon-breëbandverbinding is gekonfigureer met die volgende instellings:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Toestel:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Verskaffer:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Diensplan:"
-
-#: ../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."
-msgstr ""
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "W_agwoord:"
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Bevestig selfoon-breëbandinstellings"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "My land is nie gelys nie"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ongelys"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "Kie_s die plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr ""
-
-#: ../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."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "My land is nie gelys nie"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: ../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:"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Verskaffer:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "My verskaffer gebruik GSM-tegnologie (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "My verskaffer gebruik CDMA-tegnologie (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Kies die verskaffer"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Land- en streeklys:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land of streek"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "My land is nie gelys nie"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Kies die verskaffer se land of streek"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Enige toetstel"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nuwe selfoon-breëbandverbinding"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -3946,188 +4203,255 @@ msgstr ""
 "Dié assistent help om maklik 'n selfoon-breëbandverbinding na 'n "
 "selfoonnetwerk (3G) op te stel."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Die volgende inligting word benodig:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Die breëbandverskaffer se naam"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Enige toetstel"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Stel 'n selfoon-breëbandverbinding op"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nuwe selfoon-breëbandverbinding"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land of streek"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Kies die verskaffer se land of streek"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "My verskaffer gebruik GSM-tegnologie (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "My verskaffer gebruik CDMA-tegnologie (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Kies die verskaffer"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "Kie_s die plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Die selfoon-breëbandverbinding is gekonfigureer met die volgende instellings:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Toestel:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Verskaffer:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Diensplan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bevestig selfoon-breëbandinstellings"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(geen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Onbekend"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "W_agwoord:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "Ontsl_uit"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Vra tel_kens vir 'n wagwoord"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'n Wagwoord word benodig om aan '%s' te verbind."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "W_agwoord:"
+msgid "Sh_ow passwords"
+msgstr "_Wys wagwoord"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "W_agwoord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_Wys wagwoord"
+msgid "_Secondary Password:"
+msgstr "W_agwoord:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "W_agwoord:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Ontkoppel"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Geen"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamiese-WEP"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "S_kep"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4135,41 +4459,41 @@ msgstr ""
 "Wagwoorde of enkripsiesleutels word benodig vir toegang tot die draadlose "
 "netwerk '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Skep nuwe draadlose netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nuwe draadlose netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Gee 'n naam vir die draadlose netwerk om te skep."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Verbind aan verskuilde draadlose netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Verskuilde draadlose netwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4178,37 +4502,54 @@ msgstr ""
 "Gee die naam en sekuriteitbesonderhede van die verskuilde draadlose netwerk "
 "waaraan u wil verbind."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Draadloos-sekuriteit:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Verbi_nding:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Draadlosenetwerk-p_asstuk:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Verskaffer:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Land- en streeklys:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land of streek"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4218,435 +4559,464 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Draadloos-sekuriteit:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Netwerk-naam:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Verbi_nding:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Draadlosenetwerk-p_asstuk:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nie geaktiveer nie"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nie geregistreer is nie"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Huisnetwerk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Huisnetwerk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "soek tans"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrasie geweier"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Swerfnetwerk (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Swerfnetwerk"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kode vereis"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode word benodig vir die selfoon-breëbandtoestel"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Selfoon-breëbandverbinding '%s' is aktief: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "swerwing"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Verbi_nding:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER- of PEM-sertifikate (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM-, of PKCS#12- privaate sleutels (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "DSL-magtiging"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "DSL-magtiging"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Weergawe 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Weergawe 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
-msgid "missing EAP username"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
-msgid "missing EAP password"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
-msgid "missing EAP-TLS identity"
+#: src/wireless-security/eap-method-simple.c:90
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
-msgid "no user certificate selected"
+#: src/wireless-security/eap-method-simple.c:106
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:243
-msgid "selected user certificate file does not exist"
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
-msgid "no key selected"
+#: src/wireless-security/eap-method-simple.ui:103
+msgid "P_rivate Key Passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
-msgid "selected key file does not exist"
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Wys wagwoord"
+
+#: src/wireless-security/eap-method-tls.c:64
+msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
+#: src/wireless-security/eap-method-tls.c:256
+msgid "no user certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
+#: src/wireless-security/eap-method-tls.c:261
+msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.c:281
+msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
+#: src/wireless-security/eap-method-tls.c:286
+msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-tls.ui:20
+msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "DSL-magtiging"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr ""
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr ""
+
+#: src/wireless-security/ws-wep-key.ui:54
+msgid "_Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+msgid "_Type"
 msgstr ""
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "Verstek"
+
+#~ msgid "Ignored"
+#~ msgstr "Geïgnoreer"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Kon nie verbindinggeheime opdateer nie, as gevolg van 'n onbekende fout."
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Verbindingsinligting"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "onbekend"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager-miniprogram"
 
@@ -4752,14 +5122,6 @@ msgstr ""
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#, fuzzy
-#~ msgid "Secondary DNS:"
-#~ msgstr "Tweede DNS:"
-
-#, fuzzy
-#~ msgid "Ternary DNS:"
-#~ msgstr "Derde DNS:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Aktiveer WiMA_X-selfoonbreëband"
 
diff --git a/po/an.po b/po/an.po
index 732a9beb..60b6d516 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-09-29 13:19+0200\n"
 "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
 "Language-Team: Aragonés <softaragones@googlegroups.com>\n"
@@ -18,49 +19,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rete"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Chestione as suyas conexions de rete"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Conexions de rete"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Conexions de rete activas"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Chestione y cambee os suyos achustes d'a connexión de ret"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desactivar as notificacions de connexión"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Establir isto a cierto ta desactivar as notificacions en connectar con un "
 "ret."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desactivar as notificacions de desconnexión"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Establir isto a cierto ta desactivar as notificacions en desconnectar d'un "
 "ret."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Desactivar as notificacions de VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -68,11 +78,11 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions en connectar u "
 "desconnectar d'una VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Suprimir notificacions de retz disponibles"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -80,38 +90,39 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions en connectar con un "
 "ret."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Marca de tiempo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "S'usa ta determinar si os achustes d'han de migrar a la nueva versión."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desactivar a creyación de ret inalámbrico"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Establir isto a cierto ta desactivar a creyación de retz inalámbricas adhoc "
 "en usar a miniaplicación."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorar certificau CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -119,7 +130,7 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
 "en autenticación EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -127,137 +138,150 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
 "en a fase 2 de l'autenticación EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Miniaplicacion Chestor d'o rete"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Sin connexión de ret"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Miniaplicacion Chestor d'o rete"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Autenticación DSL"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "C_onexion:"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nome d'o rete:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Falló en adhibir/activar a connexión"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Error desconoxiu"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Informacion d'a conexion"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "desenchegau"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Desenchegau"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Informacion d'a conexion"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "No amostrar iste mensache de nuevo"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -267,7 +291,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» se desconnectó porque s'interrumpió a connexión de ret."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» ha fallau porque s'interrumpió a connexión de ret."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "A connexión de ret «%s» ha fallau porque o servicio VPN s'interrumpió "
 "inasperadament."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "A connexión VPN «%s» ha fallau porque o servicio VPN devolvió una "
 "configuración no valida."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» ha fallau porque expiró o tiempo de connexión."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -316,7 +340,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» ha fallau porque o servicio VPN no s'encetó a tiempo."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» ha fallau porque o servició VPN no podió encetar."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» falló porque no i heba secretos VPN validos."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» falló porque os secretos VPN no yeran validos."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -352,7 +376,7 @@ msgstr ""
 "\n"
 "A connexión VPN «%s» ha fallau."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -363,21 +387,21 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 #, fuzzy
 msgid "VPN connection has been successfully established.\n"
 msgstr " A connexión VPN s'ha establiu con exito.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mensache d'acceso VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "Falló a connexión VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,7 +414,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -403,576 +427,601 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr " o dispositivo no ye listo (manca o firmware)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "o dispositivo no ye listo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desenchegau"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desenchegar"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "o dispositivo no ye chestionau"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "No i hai dispositivos de ret disponibles"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "O Chestor d'o ret no ye executando-se…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Ret desactivau"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activar _rete"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Activar _inalambrico"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activar banda ampla _movil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activar n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Informacion d'a conexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Editar conexions..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Arredol"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Agora ye connectau a '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desenchegau"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "A conexion de rete a estau desenchegada."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Parando a conexion de rete \"%s\"..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Solicitando una adreza de ret ta '%s'…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Connexión de ret «%s» activa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Encetando connexión VPN «%s»…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "S'ameneste autenticación d'usuario ta la connexión VPN «%s»…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Solicitando una adreza VPN ta «%s»…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Connexión VPN «%s» activa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Sin connexión de ret"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicacion Chestor d'o rete"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Codigo PUK erronio; contacte con o proveedor d'o suyo servicio."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Codigo PIN erronio; contacte con o proveedor d'o suyo servicio."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Ninviando codigo de desbloqueo…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ampla movil (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda ampla movil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Connexión de banda ampla mobil nueva"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "S'ha establiu a connexión"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Agora ye connectau a o ret de banda ampla mobil."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Clau de paso d'o rete de banda ampla movil"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Agora ye rechistrau en o ret de casa."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Agora ye rechistrau en un ret de \"roaming\"."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Agora ye connectau a o ret de banda ampla mobil."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Preparando a connexión de banda ampla mobil '%s'…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configurando a connexión de banda ampla mobil '%s'…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "S'amenista autenticación d'usuario ta la connexión de banda ampla mobil '%s'…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "A conexion de banda ampla movil \"%s\" ye activa"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatica"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Retes cableaus (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rete cableau (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Retes cableaus"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Rete cableau"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Agora ye enchegau a lo rete cableau."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Parando a conexion cableada \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configurando a connexión de ret inalámbrico '%s'…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Solicitando una adreza de ret ta '%s'…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "A connexión de ret «%s» ye activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Ret domestico"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Ret domestico"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(denguna)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Falló en anyadir a connexion nueva"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Retes cableaus (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rete cableau (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rete cableau"
 msgstr[1] "Rete cableau"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX ye desactivada"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX ye desactivada por l'interruptor fisico"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Mas retes"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Retes inalambricos disposables"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Agora ye connectau a o ret WiMAX."
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Agora ye connectau a o ret WiMAX."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Parando a conexion de rete \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurando a connexión de ret inalámbrico '%s'…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Solicitando una adreza de ret ta '%s'…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "A connexión de ret «%s» ye activa"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "A connexión de ret «%s» ye activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Falló en activar a connexión"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Ha ocurriu una error en amostrar información d'a connexión:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinamica"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adrezas"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (Predeterminau)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconoxida"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconoxida"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adreza IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adreza de difusion"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconoxida"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mascara de subret"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS primario:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS secundario:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS terciario:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Cheneral"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adreza hardware"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocidat"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguridat:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Ruta predeterminada"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorau"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Clau de paso:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipo de VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Puerta de enlace VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nome d'_usuario VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Mensache VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "C_onexion:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconoxida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "No se trobó garra connexión activa valida"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -980,18 +1029,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "y muitos atros colaboradors y traductors d'a comunidat"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicación de l'aria de notificación ta chestionar os suyos dispositivos "
 "de ret y connexions."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Pachina web d'o Chestor d'o ret"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Daniel Martinez <entaltoaragon@gmail.com>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -999,34 +1052,34 @@ msgstr ""
 "A miniaplicación Chestor de ret no podió trobar qualques fichers de recursos "
 "(no se trobó o fichero .ui)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Recursos faltantes"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Clau de paso d'o rete de banda ampla movil"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "S'amenista una clau de paso ta connectar con «%s»"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Clau de paso:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "S'amenista un codigo PIN de desbloqueo"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "S'amenista un codigo PIN de desbloqueo"
 
 # of times you can enter incorrect PIN
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1036,26 +1089,26 @@ msgstr ""
 "usar-lo."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Codigo PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Amostrar codigo PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Cal desbloqueo PUK d'a SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Cal desbloqueo PUK d'a SIM"
 
 # of times you can enter incorrect PUK
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,35 +1118,42 @@ msgstr ""
 "usar-lo."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Codigo PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Codigo PIN nuevo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Torna a meter o codigo PIN nuevo:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Amostrar codigos 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Informacion d'a conexion"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Falló en creyar a conexión DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1102,44 +1162,44 @@ msgstr ""
 "L'adreza IP identifica a suya equipo en o ret. Prete o botón \"Adhibir\" ta "
 "adhibir una adreza IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 #, fuzzy
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 #, fuzzy
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norar rotas obtenidas automaticament"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Usar ista c_onexión solament ta os recursos en o suyo ret"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 #, fuzzy
 msgid ""
 "If enabled, this connection will never be used as the default network "
@@ -1148,17 +1208,17 @@ msgstr ""
 "Si ye activau, ista connexión nunca s'usará como a connexión de ret "
 "predeterminau."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Creyar…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Trigar un tipo de connexión VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1170,213 +1230,273 @@ msgstr ""
 "connexión VPN que quiere creyar no amaneixe en a lista, puede que no tienga "
 "instalau o complemento de VPN correcto."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Servicio"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Adreza de difusion:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "C_onexion:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_odo:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Interfaz:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "DNS primario:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "C_onexion:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Activar _rete"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatico"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predeterminau"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1387,442 +1507,532 @@ msgstr ""
 "dispositivo de ret en o qual s'activa ista connexión. Ista caracteristica se "
 "conoixe como clonado MAC u «spoofing». Eixemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adreza"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adreza"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Adreza hardware:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Cualsiquier dispositivo"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Falló en actualizar os secretos d'a connexión a causa d'una error "
-"desconoixida."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Fer servir seguranza 802.1_X ta ista connexión"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nome d'_usuario:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servicio"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "A_mostrar clau de paso"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "Clau de _paso:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfaz"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfaz:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfaz:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Par cruciau (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 #, fuzzy
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Interficie d'unidat d'acoplamiento (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 #, fuzzy
 msgid "Media Independent Interface (MII)"
 msgstr "Interficie independient de meyos (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Puerto:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Servicio"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Adreza MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Clau de pase de clau _privada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Predeterminau"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Adreza de difusion:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Clau de pase de clau _privada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocidat:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Denguna"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Agora ye enchegau a lo rete cableau."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Desbloquiar automaticament iste dispositivo"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Informacion d'a conexion"
+msgid "_Metered connection"
+msgstr "C_onexion:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Connectar _automaticament"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1831,7 +2041,7 @@ msgstr ""
 "L'adreza IP identifica a suya equipo en o ret. Prete o botón \"Adhibir\" ta "
 "adhibir una adreza IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1839,128 +2049,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatico, solo que adrezas"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adrezas"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "desenchegau"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Servicio"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatica con configuración manual de DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Enlace 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Compartida con atros equipos"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metodo:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1971,8 +2184,8 @@ msgstr ""
 "personalizar a configuración d'a suya equipo. Si quiere usar un "
 "identificador de client DHCP ingréselo aquí."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 #, fuzzy
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
@@ -1981,25 +2194,26 @@ msgstr ""
 "Os dominios que usar en resolver os nombres d'equipos. Use minches ta "
 "deseparar dominios multiples."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID d'o client D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Dominios de bu_sca:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Servidors _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2009,12 +2223,12 @@ msgstr ""
 "d'equipos. Use minches ta deseparar adrezas de servidors de nombres de "
 "dominio multiples."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Requiere adreza IPv_4 ta que ista connexión se complete"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 #, fuzzy
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
@@ -2023,26 +2237,35 @@ msgstr ""
 "Al connectar a retz capaces IPv6, permite a la connexión completar si a "
 "configuración IPv4 falla pero a configuración IPv6 tiene exito. "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 #, fuzzy
 msgid "_Routes…"
 msgstr "_Rotas…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desactivau"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2053,16 +2276,20 @@ msgstr ""
 "d'equipos. Use minches ta deseparar adrezas de servidors de nombres de "
 "dominio multiples."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requiere adreza IPv_6 ta que ista connexión complete"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 #, fuzzy
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
@@ -2071,755 +2298,859 @@ msgstr ""
 "Al connectar a retz capaces IPv4, permite a la connexión completar si a "
 "configuración IPv6 falla pero a IPv4 tiene exito."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrica"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Importar"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Basica"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avanzada"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "Nombre d'o _AP:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID de R_ete:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Cambear..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permitir '_roaming' si o ret domestico no ye disponible"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "A_mostrar claus de paso"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Metodos permitius:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurar _metodos…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Usar zifrau punto-a-punto (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 #, fuzzy
 msgid "_Require 128-bit encryption"
 msgstr "_Requerir zifrau de 128-bits"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Usar e_staus MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 #, fuzzy
 msgid "Allow _BSD data compression"
 msgstr "Permitir compresión de datos _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 #, fuzzy
 msgid "Allow _Deflate data compression"
 msgstr "Permitir compresión de datos _deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 #, fuzzy
 msgid "Use TCP _header compression"
 msgstr "Usar compresión de ca_beceras TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eco"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Ninviar paquetz _echo PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Metodo:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metodo:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avanzada"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Retes cableaus"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "S_eguridat:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Clau pri_vada:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interfaz:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "C_onexion:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet automatica"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Adreza hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Adreza hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Potencia d'a transmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Potencia d'a transmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Interfaz:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Interfaz:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Adreza MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Potencia d'a transmisión:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Taxa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Metodos d'autenticación permitius"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Protocolo d'autenticación extensible"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protocolo d'autenticación por clau"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protocolo d'autenticación d'intercambeo de sinyals "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protocolo d'autenticación d'intercambeo de sinyals de Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAPv_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Protocolo d'autenticación d'intercambeo de sinyals de Microsoft versión 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2829,194 +3160,188 @@ msgstr ""
 "d'autenticación. Si a connexión falla, prebe de desactivar o suporte ta "
 "qualques metodos."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "ADSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "O complemento de VPN falló en importar correctament a connexión VPN\n"
 "\n"
 "Error: no existe o tipo de servicio VPN."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "No se puede importar a connexión VPN"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"No se podió leyer o fichero «%s» u no contiene información de connexión VPN "
-"que se pueda reconoixer\n"
-"\n"
-"Error: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Error desconoxiu"
-
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 #, fuzzy
 msgid "Select file to import"
 msgstr "Seleccione o fichero que importar"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Adreza hardware:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Exportar connexión VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "L'editor d'a connexión no se podió encetar a causa d'una error desconoixida."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "No se podió creyar a nueva connexión"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Falló en eliminar a connexión"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ye seguro que quiere eliminar a connexión %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Connexions _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adreza"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Mascara de ret"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 #, fuzzy
 msgid "Editing un-named connection"
 msgstr "Editando a connexión sin nombre"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nombre d'a connexión:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Error en inicializar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Falló en adhibir a connexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -3025,55 +3350,52 @@ msgstr ""
 "L'editor d'a connexión no podió trobar qualques fichers de recursos (no se "
 "trobó o fichero .iu)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Alzar"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Alzar qualsiquier cambeo realizau en ista connexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Autenticar ta alzar ista connexión ta totz os usuarios en este equipo."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "No se podió creyar a nueva connexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "No se podió editar a connexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Error en creyar a connexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Error en inicializar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Falló en adhibir a connexión"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3082,207 +3404,253 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
 "en autenticación EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nombre d'a connexión:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_xportar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "brenca"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa %d menutos"
 msgstr[1] "fa %d menutos"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa %d hora"
 msgstr[1] "fa %d horas"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa %d diya"
 msgstr[1] "fa %d diyas"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa %d mes"
 msgstr[1] "fa %d meses"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fa %d anyada"
 msgstr[1] "fa %d anyadas"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Falló en adhibir a connexión"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Conexion cableada %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Conexion cableada %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Feita servir por zaguera vegada"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "Editar a connexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentíquese ta editar a connexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Eliminar a connexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentíquese ta eliminar a connexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "O tipo de connexión de banda ampla mobil no ye suportau."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Se desconoixe cómo creyar connexions «%s»"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Editar conexions..."
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Error en creyar a connexión"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Falló en adhibir a connexión"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Se desconoixe cómo creyar connexions «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Editar conexions..."
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "No se trobó una connexión con UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Conexions de rete"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Connexions _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguridat 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "No se podió cargar a interficie d'usuario de seguranza cableada."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Fer servir seguranza 802.1_X ta ista connexión"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexion cableada %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Activar _rete"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Rete inalambrico"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS primario:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Conexion cableada %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Conexion cableada %d"
@@ -3290,35 +3658,40 @@ msgstr "Conexion cableada %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 #, fuzzy
 msgid "Could not load DSL user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfaz:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexion ADSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3328,57 +3701,56 @@ msgstr ""
 "Ista opción bloca ista connexión a o dispositivo de ret especificau por a "
 "suya adreza permanent MAC aquí introducida. Por eixemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorau"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Adreza MAC _clonada:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexion cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Predeterminau"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3389,188 +3761,192 @@ msgstr ""
 "Ista opción bloca ista connexión a o dispositivo de ret especificau por a "
 "suya adreza permanent MAC aquí introducida. Por eixemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "No se podió cargar a interficie d'usuario ta IPv4."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexion cableada %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "No se podió cargar a interficie d'usuario ta IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Conexion cableada %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatico (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Solo que adrezas automaticas (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatico, solo que adrezas"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatico (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Solo que adrezas automaticas (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatico (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Solo que adrezas automaticas (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Solo que enlace local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Servidors _DNS adicionals:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dominios de bu_sca adicionals:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, fuzzy, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando as rotas IPv4 ta %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Achustes d'IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 #, fuzzy
 msgid "Could not load IPv4 user interface."
 msgstr "No se podió cargar a interficie d'usuario ta IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatico, solo que DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, fuzzy, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando as rotas IPv6 ta %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Achustes d'IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 #, fuzzy
 msgid "Could not load IPv6 user interface."
 msgstr " No se podió cargar a interficie d'usuario ta IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "No se podió cargar a interficie d'usuario ta DSL."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Conexion ADSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 #, fuzzy
 msgid "Could not load mobile broadband user interface."
 msgstr "No se podió cargar a interficie d'usuario de banda ampla mobil."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 #, fuzzy
 msgid "Unsupported mobile broadband connection type."
 msgstr "O tipo de connexión de banda ampla mobil no ye suportau."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccionar o tipo de proveedor de banda ampla mobil"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3579,7 +3955,7 @@ msgstr ""
 "Seleccionar a tecnolochía que o proveedor d'a suya banda ampla mobil usa. Si "
 "no ye seguro pregunte-le a o suyo proveedor."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 #, fuzzy
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
@@ -3587,86 +3963,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "O mío proveedor usa tecnolochía basada en C_DMA (eix. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "denguno"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, fuzzy, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editando os metodos d'autenticación PPP ta %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Achustes de PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 #, fuzzy
 msgid "Could not load PPP user interface."
 msgstr " No se podió cargar a interficie d'usuario ta PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Conexion cableada %d"
@@ -3674,11 +4046,11 @@ msgstr "Conexion cableada %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
@@ -3686,61 +4058,61 @@ msgstr "No se podió cargar a interficie d'usuario ta DSL."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Sin connexión de ret"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "No se podió cargar a interficie d'usuario ta IPv4."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Conexion VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "No se podió cargar a interficie d'usuario ta la VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "No se podió trobar o complemento de servicio VPN ta «%s»."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "No se podió trobar o complemento de servicio VPN ta «%s»."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Informacion d'a conexion"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "No se podió cargar a interficie d'usuario ta la VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "No se podió trobar o complemento de servicio VPN ta «%s»."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexion VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Trigar un tipo de connexión VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3751,7 +4123,7 @@ msgstr ""
 "connexión VPN que quiere creyar no amaneixe en a lista, puede que no tienga "
 "instalau o complemento de VPN correcto."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3760,7 +4132,7 @@ msgstr ""
 "Ista opción bloca ista connexión a o dispositivo de ret especificau por a "
 "suya adreza permanent MAC aquí introducida. Por eixemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3770,100 +4142,98 @@ msgstr ""
 "Ista opción bloca ista connexión a o dispositivo de ret especificau por a "
 "suya adreza permanent MAC aquí introducida. Por eixemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Cualsiquier dispositivo"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexion cableada %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hexadecimal u ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP de 128 bits"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamica (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 presonal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "No se podió cargar a interficie d'usuario de seguranza cableada."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Seguridat inalambrica"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "No se podió cargar a interficie d'usuario de seguranza cableada."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Ya existe un fichero clamau «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 #, fuzzy
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, fuzzy, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Quiere reemplazar %s con a connexión VPN que ye alzando?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "No se puede exportar a connexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3874,228 +4244,108 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Exportar connexión VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desbloqueyar"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 #, fuzzy
 msgid "Automatically unlock this device"
 msgstr "Desbloquiar automaticament iste dispositivo"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informacion d'a conexion"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Conexions de rete activas"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ignorar certificau CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trie un certificau CA:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Clau pri_vada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Clau de pase de clau _privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Trie un certificau CA:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Certificau de l'_usuario"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-" A suya connexión de banda ampla mobil ye configurada con os siguients "
-"achustes:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "O suyo dispositivo:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "O suyo proveedor:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "O suyo plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Agora se creyará una connexión con a suya proveedor de banda ampla mobil "
-"usando os achustes seleccionaus. Si a connexión falla u no puede accedir a "
-"os recursos d'o ret, comprebe dos vegadas os suyos achustes. Ta modificar os "
-"suyos achustes de connexión d'a banda ampla mobil, trigue \"Connexions de ret"
-"\" dende o menú Sistema » Preferencias."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirmar os achustes d'a banda ampla mobil"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "O mio pais no ye en a lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 #, fuzzy
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-#, fuzzy
-msgid "_Select your plan:"
-msgstr "_Seleccionar o suyo plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-#, fuzzy
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Plan _APN (nombre d'o punto d'acceso) seleccionau:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Alvertencia: seleccionar un plan incorrecto puede resultar en problemas de "
-"facturas ta la suya cuenta de banda ampla u impedir a conectividat.\n"
-"\n"
-"Si no ye seguro d'o suyo plan consulte a o suyo proveedor ta o suyo plan APN."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Trigar o suyo plan de pres"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "O mío plan no ye en a lista…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-#, fuzzy
-msgid "Select your provider from a _list:"
-msgstr "Seleccionar o suyo proveedor d'a _lista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Proveedor:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "O mío proveedor usa tecnolochía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "O mío proveedor usa tecnolochía CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Trie o suyo proveedor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista de paises u rechions"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Pais u rechion"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "O mio pais no ye en a lista"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Trie o pais u la rechion d'o suyo proveedor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalau"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalau"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Cualsiquier dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Connexión de banda ampla mobil nueva"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 #, fuzzy
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
@@ -4104,264 +4354,366 @@ msgstr ""
 "Iste asistent le aduya a configurar una connexión de banda ampla mobil con "
 "un ret mobil (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 #, fuzzy
 msgid "You will need the following information:"
 msgstr "Amenesterá a siguient información:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "O nombre d'o suyo proveedor de banda ampla"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "O nombre d'o suyo plan de pres"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(En qualques casos) o suyo plan de pres APN (nombre d'o punto d'acceso)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 #, fuzzy
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Creyar una connexión para ye_te dispositivo de banda ampla mobil:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Cualsiquier dispositivo"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar una connexión de banda ampla mobil"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Connexión de banda ampla mobil nueva"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Pais u rechion"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Trie o pais u la rechion d'o suyo proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+#, fuzzy
+msgid "Select your provider from a _list:"
+msgstr "Seleccionar o suyo proveedor d'a _lista:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O mío proveedor usa tecnolochía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O mío proveedor usa tecnolochía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Trie o suyo proveedor"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+#, fuzzy
+msgid "_Select your plan:"
+msgstr "_Seleccionar o suyo plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+#, fuzzy
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (nombre d'o punto d'acceso) seleccionau:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Alvertencia: seleccionar un plan incorrecto puede resultar en problemas de "
+"facturas ta la suya cuenta de banda ampla u impedir a conectividat.\n"
+"\n"
+"Si no ye seguro d'o suyo plan consulte a o suyo proveedor ta o suyo plan APN."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Trigar o suyo plan de pres"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+" A suya connexión de banda ampla mobil ye configurada con os siguients "
+"achustes:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "O suyo dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "O suyo proveedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "O suyo plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Agora se creyará una connexión con a suya proveedor de banda ampla mobil "
+"usando os achustes seleccionaus. Si a connexión falla u no puede accedir a "
+"os recursos d'o ret, comprebe dos vegadas os suyos achustes. Ta modificar os "
+"suyos achustes de connexión d'a banda ampla mobil, trigue \"Connexions de ret"
+"\" dende o menú Sistema » Preferencias."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmar os achustes d'a banda ampla mobil"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(denguna)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificau C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Desconoxida"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Trie un certificau CA:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Certificau de l'_usuario"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Editar conexions..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Desbloqueyar"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Preguntar ista clau cada vegada"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "S'amenista una clau de paso ta connectar con «%s»"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "Clau de _paso:"
+msgid "Sh_ow passwords"
+msgstr "A_mostrar claus de paso"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "Clau de _paso:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "A_mostrar claus de paso"
+msgid "_Secondary Password:"
+msgstr "Clau de _paso:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "Clau de _paso:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desenchegar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamica (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_reyar"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Ret domestico"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Ret domestico"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Seguridat inalambrica:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "C_onexion:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
-msgstr ""
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "Cualsiquier dispositivo"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Proveedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista de paises u rechions"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Pais u rechion"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Cableau"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4371,17 +4723,40 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Seguridat inalambrica:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome d'o rete:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "C_onexion:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4389,7 +4764,7 @@ msgstr ""
 "Iste programa ye un componente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4397,417 +4772,469 @@ msgstr ""
 "No ye pensau ta interacción a traviés d'a linia de comandos pero en cuentas "
 "s'executa en l'entorno d'escritorio GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "no activau"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no ye rechistrau"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ret domestico (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Ret domestico"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "se denegó o rechistro"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ret roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rete roaming"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Codigo PIN ta la tarcheta SIM '%s' en '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "S'amenista un codigo PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "S'amenista un codigo PIN ta o dispositivo de banda ampla mobil"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "A connexión de banda ampla mobil '%s' ye activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Connexión %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ignorar certificau CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Trigar un fichero PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Fichers PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Totz os fichers"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticau"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Totz dos"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identidat anóni_ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Fichero _PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automatica"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Trigue un certificau CA…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificau C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ignorar certificau CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Version _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Frase de paso WEP de 128 bits"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "A_mostrar claus de paso"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignorar certificau CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ignorar certificau CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentidat:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "RAPIDO"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS tunelau"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protechiu (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Predeterminau)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema ubierto"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Predeterminau)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Clau:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "A_mostrar clau"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "En_diz WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipo:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (Predeterminau)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorau"
+
+#, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Falló en actualizar os secretos d'a connexión a causa d'una error "
+#~ "desconoixida."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Informacion d'a conexion"
+
+#~ msgid "DSL"
+#~ msgstr "ADSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "No se puede importar a connexión VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "No se podió leyer o fichero «%s» u no contiene información de connexión "
+#~ "VPN que se pueda reconoixer\n"
+#~ "\n"
+#~ "Error: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Error desconoxiu"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Trigue un certificau CA…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Certificau C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Miniaplicacion Chestor d'o rete"
@@ -4838,15 +5265,6 @@ msgstr "_Tipo:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #, fuzzy
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegociar"
@@ -4949,12 +5367,6 @@ msgstr "_Tipo:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundario:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciario:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Activar banda ampla movil WiMA_X"
 
@@ -4997,12 +5409,6 @@ msgstr "_Tipo:"
 #~ msgid "_Save..."
 #~ msgstr "_Alzar..."
 
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Connectar _automaticament"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Disponible ta _totz os usuarios"
 
@@ -5064,10 +5470,6 @@ msgstr "_Tipo:"
 #~ msgid "Error: %s"
 #~ msgstr "Error: %s"
 
-#, fuzzy
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Falló en creyar a conexión DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "O suyo telefono ye listo ta usar"
 
@@ -5128,9 +5530,6 @@ msgstr "_Tipo:"
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Ya ye atra instancia de nm-applet echecutanso-se.\n"
 
-#~ msgid "translator-credits"
-#~ msgstr "Daniel Martinez <entaltoaragon@gmail.com>"
-
 #~ msgid "<b>Addresses</b>"
 #~ msgstr "<b>Adrezas</b>"
 
diff --git a/po/ar.po b/po/ar.po
index 456122da..08354d0c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ar\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-09-17 16:16+0300\n"
 "Last-Translator: Abdalrahim G. Fakhouri <abdilra7eem@yahoo.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -25,237 +26,260 @@ msgstr ""
 "X-Poedit-Language: Arabic\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "شبكة"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "إدارة اتصالات الشبكة"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "الاتصالات الشبكية"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "خطأ إعداد VPN"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "أدِر وغيّر إعدادات الاتصالات الشبكية"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "عطل تنبيهات الاتصالات "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "عطل تنبيهات قطع الاتصالات"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "عطل تنبيهات الاتصالات "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "حظر تنبيهات توفر الشبكة"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "ختم"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "يستخدم لتحديد اذا ما الخيارات يجب ان ترحّل الى اصدار جديد."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "عطل انشاء الاتصال اللاسلكي "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "ملف شهادة سُلْطة استيثاق"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "مدير الشبكة"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "لا يوجد اتصال شبكي"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "بريمج مدير الشبكة"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "استيثاق 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "ا_تّصل"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "اسم ال_شبكة:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "لا مركزية"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "لا توجد اتصالات نشطة!"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "مجهول"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "فشل اضافة اتصال "
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "غير متَّصل"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "غير متّصل"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "فشل اضافة اتصال "
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "لا تظهر هذه الرسالة مرة أخرى"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "فُصِل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -284,7 +308,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لأن خدمة VPN توفقت فجأة."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -294,7 +318,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لأن خدمة أعادت إعدادا غير سليم."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -303,7 +327,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لانتهاء مهلة محاولة الاتصال."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -312,7 +336,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لأن خدمة VPN لم تبدأ في الوقت المحدد."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -321,7 +345,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لأن خدمة VPN فشلت في البدء."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -330,7 +354,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' لعدم وجود أسرار VPN سليمة."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -339,7 +363,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s' بسبب أسرار VPN غير سليمة."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -348,7 +372,7 @@ msgstr ""
 "\n"
 "فشل اتصال VPN ‏'%s'."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -356,19 +380,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "رسالة التسجيل في VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "فشل اتصال VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -381,7 +405,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -394,329 +418,340 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "الجهاز ليس جاهزا (البرمجية المضمنة مفقودة)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "الجهاز ليس جاهزا"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "غير متَّصل"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "اقطع الاتصال"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "الجهاز ليس مُدارا"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "لا تتوفر أي أجهزة شبكة."
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "ا_تّصالات VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "ا_ضبط VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "ا_تّصالات VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "مدير الشبكة لا يعمل"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "الشبكات معطلة"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "فعّل _الاتصال الشبكي"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "فعّل ال_لاسلكي"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_فعّل شبكة الهاتف المحمول"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_فعّل التنبيهات"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "م_علومات الاتصال"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "_حرر الاتصالات..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_عن"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "أنت متصل الآن ب‍ '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "غير متّصل"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "انقطع اتصال الشبكة."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "يجهز الاتصال الشبكي '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "يطلب عنوان شبكي ل‍ '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "الاتصال الشبكي '%s' يعمل"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "يبدأ اتصال VPN‏ '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "الاستيثاق من المستخدم مطلوب لاتصال VPN‏ '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "يطلب عنوان شبكي VPN ل‍ '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "الاتصال الشبكي VPN‏ '%s' يعمل"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "لا يوجد اتصال شبكي"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "بريمج مدير الشبكة"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "رمز PUK خطأ، راجع مزود الخدمة."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "رمز PIN خطأ، راجع مزود الخدمة."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "يرسل رمز الفتح..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "شبكة هاتف محمول (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "شبكة هاتف محمول"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "متاح"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "اتصال شبكة هاتف محمول جديد..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "تم الاتصال"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "أنت متصل الآن بشبكة الهاتف المحمول."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "كلمة سر شبكة الهاتف المحمول"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "أنت الآن مسجل بشبكة الوطن."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "أنت الآن مسجل بشبكة التجوال."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "أنت متصل الآن بشبكة الهاتف المحمول."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "يجهز اتصال شبكة الهاتف المحمول '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "يعِدّ اتصال شبكة الهاتف المحمول '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بشبكة الهاتف المحمول '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "إيثرنت تلقائي"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "شبكات سلكية (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "شبكة سلكية (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "شبكات سلكية"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "شبكة سلكية"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "أنت متصل الآن بالشبكة السلكية."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "يجهز اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "يعِدّ اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة السلكية '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "يطلب عنوان شبكي سلكي ل‍ '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "الاتصال الشبكي السلكي '%s' يعمل"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "استيثاق DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "اتصل بشبكة لاسلكية مخفية"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "أنشئ شبكة لاسلكيّة جديدة"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(لا شيء)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "تعذّر تعديل الاتصال الجديد"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "شبكات سلكية (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "شبكة سلكية (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
@@ -727,251 +762,265 @@ msgstr[3] "شبكة سلكية"
 msgstr[4] "شبكة سلكية"
 msgstr[5] "شبكة سلكية"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "شبكة WiMAX معطلة"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "شبكة WiMAX مغلقة بمفتاح في العتاد"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "المزيد من الشبكات"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "الشبكات اللاسلكية المتاحة"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "استخدم قائمة الشبكة للاتصال بشبكة لاسلكية"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "أنت متصل الآن بالشبكة اللاسلكية '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "يجهز الاتصال الشبكي '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "يعِدّ اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة اللاسلكية '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "يطلب عنوان شبكي ل‍ '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "الاتصال الشبكي اللاسلكي '%s' يعمل: %s‏ (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "الاتصال الشبكي السلكي '%s' يعمل"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "لا توجد اتصالات نشطة!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "العناوين"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "بدون"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (المبدئي)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u م.بايت\\ث"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "مجهول"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "عنوان IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "عنوان البثّ"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "قناع الشبكة الفرعية"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "‏DNS الأوّلي:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "‏DNS الثّانوي:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "‏DNS الثالثي:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "إيثرنت (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 واي فاي (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "عام"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "الواجهة"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "عنوان العتاد"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "المُشغّل"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "السرعة"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "الأمن:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "السبيل الافتراضي"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "متروك"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "كلمة السر:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "ال_نوع:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "البوّابة"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "اسم المس_تخدم:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "الات_صال:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "مجهول"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "لا توجد اتصالات نشطة سليمة!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -979,16 +1028,23 @@ msgstr ""
 "حقوق محفوظة © 2005-2008 نوفل.\n"
 "والكثير من مساهمي المجتمع والمترجمين."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "بريمج منطقة التبليغ لإدارة الأجهزة الشبكية والاتصالات."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "موقع مدير الشبكة"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"فريق عربآيز للترجمة http://www.arabeyes.org :\n"
+"جهاد عفيفي\t<djihed@gmail.com>\n"
+"خالد حسني\t<khaledhosny@eglug.org>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -996,33 +1052,33 @@ msgstr ""
 "لم يستطع بريمج مدير الشبكة إيجاد بعض المصادر المطلوبة (the .ui file was not "
 "found)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "موارد ناقصة"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "كلمة سر شبكة الهاتف المحمول"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "كلمة سر مطلوبة للاتصال بشبكة الهاتف المحمول '%s'."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "بحاجة لفتح PIN بطاقة الهاتف"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "بحاجة لفتح PIN بطاقة الهاتف"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1030,25 +1086,25 @@ msgid ""
 msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PIN للشريحة قبل استخدامه."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "رمز PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "أظهر رمز PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "بحاجة لفتح PUK بطاقة الهاتف"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "بحاجة لفتح PUK بطاقة الهاتف"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1056,35 +1112,42 @@ msgid ""
 msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PUK للشريحة قبل استخدامه."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "رمز PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "رمز PIN جديد:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "أعد إدخال رمز PIN الجديد:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "أظهر رمز 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "معلومات الاتصال"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "لا توجد اتصالات نشطة!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1092,58 +1155,58 @@ msgid ""
 msgstr ""
 "تحدّد عناوين IP هويّة حاسوبك على الشبكة .اضغط زر \"إضافة\" لإضافة  عنوان IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "اح_ذف"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "احفظ هذا الاتصال لكل المستخدمين على هذا الجهاز."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "اذا ممكّن ,هذا الاتصال لن يتم استخدامة ابدا كاتصال مبدئي."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "أُنشئ…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "اختر نوع اتصال VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1155,649 +1218,798 @@ msgstr ""
 "الذي ترغب في تكوينة في القائمة، فقد يعني هذا أنّ ملحق VPN الذي تحتاجه غير "
 "مثبّت."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "الخ_دمة:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "عنوان البثّ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "الات_صال:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_حرّر"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "الواجهة:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "‏DNS الأوّلي:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "بايتات"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "الأ_من:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "الات_صال:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "فعّل _الاتصال الشبكي"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "تلقائي"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "المبدئي"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "العنوان"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "العنوان"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "عنوان العتاد:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "أي جهاز"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "فشل تحديث الاتصال السري بسبب خطأ مجهول."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "اسم المس_تخدم:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "الخ_دمة:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "أظهر _كلمة السر"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_كلمة السر:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "الواجهة"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "الواجهة:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "الواجهة:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "تلقائي"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 م.بايت\\ث"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 م.بايت\\ث"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 ج.بايت/ث"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 ج.بايت/ث"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "متروك"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "يدويا"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "ال_منفذ:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "الخ_دمة:"
+msgid "_Port"
+msgstr "ال_منفذ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "عنوان _MAC:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "كل_مة سر المفتاح السري:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "المبدئي"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "متروك"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "عنوان البثّ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "كل_مة سر المفتاح السري:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ال_سرعة:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "بدون"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "أنت متصل الآن بالشبكة السلكية."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "م_علومات الاتصال"
+msgid "_Metered connection"
+msgstr "الات_صال:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "اتصل _تلقائيا"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1805,7 +2017,7 @@ msgid ""
 msgstr ""
 "تحدّد عناوين IP هويّة حاسوبك على الشبكة .اضغط زر \"إضافة\" لإضافة  عنوان IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1813,162 +2025,165 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "تلقائي، عناوين فقط"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "العناوين"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "ا_تّصل"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "الخ_دمة:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "إيثرنت (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "تلقائي مع إعدادات DNS يدوية"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ربط-محلي"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "مشارك مع أجهزة أخرى"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "ال_طريقة:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 "المجالات تستخدم عند حل اسماءالمضيف . استخدم الفواصل لتفريق المجالات المتعددة."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "معرف عميل D_HCP:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "_نطاقات البحث:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_خواديم DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1976,36 +2191,45 @@ msgstr ""
 "عناوين IP لخوادم أسماء النطاقات التي تستخدم لمعالجة اسماء المضيفات .استخدم "
 "فواصل لتفريق أسماء خوادم أسماء النطاقات."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "اطلب اتصالاً بعنوان ipv4 لكي يتم هذا الاتصال "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "ال_طُرق…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2015,1055 +2239,1152 @@ msgstr ""
 "عناوين IP لخوادم أسماء النطاقات التي تستخدم لمعالجة اسماء المضيفات .استخدم "
 "فواصل لتفريق أسماء خوادم أسماء النطاقات."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "اطلب اتصالاً بعنوان ipv4 لكي يتم هذا الاتصال "
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "ا_ستورد"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "أساسي"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "الر_قم:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "متقدم"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "معرف ال_شبكة:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "غيّر..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "أظهر _كلمات السر"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "الاستيثاق"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "الطرق المسموحة:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "اضبط ال_طُُرق…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "الضغط"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ا_ستخدم تعمية النقطة إلى النقطة (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "تطلب _تعمية 128-بتة"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ال_طريقة:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "بدون"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ال_طريقة:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "متقدم"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "شبكات سلكية"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "الأ_من:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "الأ_من:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "الأ_من:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "المفتاح ال_سري:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "خطأ إعداد VPN"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "خطأ إعداد VPN"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "الأ_من:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "إيثرنت (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "الات_صال:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "إيثرنت تلقائي"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "عنوان العتاد:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "عنوان العتاد:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "الأ_من:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "الواجهة:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "الواجهة:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "عنوان _MAC:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "الأمن:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "‏A ‏(5 ج.هرتز)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "لا مركزية"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "طرق الاستيثاق المسموحة"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "برتوكول الاستيثاق الممتد"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "برتوكول الاستيثاق بكلمة السر"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "فشل ملحق اتصال VPN في استيراد اتصال VPN بشكل صحيح\n"
 "\n"
 "الخطأ:لم يحدد نوع خدمة VPN"
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "لا يمكن استيراد اتصال ال VPN"
-
-#: ../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."
-msgstr ""
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "مجهول"
-
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "اختر ملفا لاستيراده"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "عنوان العتاد:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "صدّر اتصال VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "تعذّر تشغيل واجهة محرر الاتصال بسبب خطأ مجهول."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "تعذّر إنشاء اتصال جديد"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "فشلت إزالة الاتصال"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "هل أنت متأكد من حذف هذا الاتصال %s؟"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "ا_تّصالات VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "العنوان"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "قناع الشبكة"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "البوّابة"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "يحرر %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "يحرر اتصالا غير مُسمى"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "ا_سم الاتصال:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "خطأ في بدء المحرر"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "فشل اضافة اتصال "
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "بعض الموارد اللازمة غائبة (ملف glade)!"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "ا_حفظ"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "احفظ كلّ التغييرات التي تم عملها لهذا الاتصال ."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "استوثق لحفظ هذا الاتصال لكل المستخدمين على هذا الجهاز ."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "تعذّر إنشاء اتصال جديد"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "تعذّر تعديل الاتصال "
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "خطأ عرض معلومات الاتصال:"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "خطأ في بدء المحرر"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 #, fuzzy
 msgid "Connection add failed"
 msgstr "فشل اضافة اتصال "
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "ا_سم الاتصال:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_صدّر"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "العنوان"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "العنوان"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "أبدًا"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "الآن"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3074,7 +3395,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3085,7 +3406,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3096,7 +3417,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3107,7 +3428,7 @@ msgstr[3] "منذ %d أشهر"
 msgstr[4] "منذ %d شهرا"
 msgstr[5] "منذ %d شهر"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3118,127 +3439,172 @@ msgstr[3] "منذ %d سنوات"
 msgstr[4] "منذ %d سنة"
 msgstr[5] "منذ %d سنة"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "فشل اضافة اتصال "
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "الاتصال السلكي %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "الاتصال السلكي %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "الاسم"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "آخر استخدام"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "حرّر الاتصال المحدد"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "استوثق لتحرير الاتصال المحدد"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "احذف الاتصال المحدد."
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "استوثق لحذف الاتصال المحدد"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "نوع اتصال المحمول غير مدعوم."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "لا توجد اتصالات نشطة!"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "خطأ أثناء عرض معلومات الاتصال:"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "فشل اضافة اتصال "
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "لا توجد اتصالات نشطة!"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "الاتصالات الشبكية"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "ا_تّصالات VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "أمن 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية الأمنية"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "لم يتم العثور على جهاز بلوتوث "
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "الاتصال السلكي %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ال_ولوج إلى الشبكة"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "شبكة لاسلكية"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "‏DNS الأوّلي:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "الاتصال السلكي %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "الاتصال السلكي %d"
@@ -3246,91 +3612,95 @@ msgstr "الاتصال السلكي %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "الواجهة:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "اتصال DSL‏ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "متروك"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "إيثرنت (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "عنوان _MAC:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "الاتصال السلكي %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "المبدئي"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3338,186 +3708,188 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "الاتصال السلكي %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "لم اتمكن من تحميل الاسلكي الامنية"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "الاتصال السلكي %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "تلقائي (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "عناوين (VPN) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "تلقائي، عناوين فقط"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "تلقائي (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "عناوين (PPPoE) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "تلقائي (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "عناوين (DHCP) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_خواديم DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_نطاقات البحث:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "إعدادات IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "لم اتمكن من تحميل الاسلكي الامنية"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "تلقائي, (DHCP)فقط"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "إعدادات IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "تعذّر تحميل واجهة المستخدم لـIPv6"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "الإتّصال بالـ VPN '%s'"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "تعذّر تحميل واجهة المستخدم لاتصال المحمول."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "نوع اتصال المحمول غير مدعوم."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "اختر مزود خدمة اتصالات المحمول"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3526,90 +3898,86 @@ msgstr ""
 "اختر نوع اتصال المحمول الذي يقدمه مزودك. اذا لم تكن متأكدا, اسأل مزود الخدمة."
 "الخدمة."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS، HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "لا شيء"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "إعدادات PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "الاتصال السلكي %d"
@@ -3617,11 +3985,11 @@ msgstr "الاتصال السلكي %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "تعذر تحميل واجهة PPP"
@@ -3629,60 +3997,60 @@ msgstr "تعذر تحميل واجهة PPP"
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "لا يوجد اتصال شبكي"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "لم اتمكن من تحميل الاسلكي الامنية"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "اتصال VPN‏ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "تعذر تحميل واجهة VPN"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "تعذر ايجاد ملحق خدمة VPN ل  '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "تعذر ايجاد ملحق خدمة VPN ل  '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "فشل اضافة اتصال "
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "تعذر تحميل واجهة VPN"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "تعذر ايجاد ملحق خدمة VPN ل  '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "اتصال VPN‏ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "اختر نوع اتصال VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3693,113 +4061,111 @@ msgstr ""
 "الذي ترغب في تكوينة في القائمة، فقد يعني هذا أنّ ملحق VPN الذي تحتاجه غير "
 "مثبّت."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u م.هرتز)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "أي جهاز"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "الاتصال السلكي %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "مفتاح WEP 40/128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارة سر WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA و WPA2 للشركات"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "تعذر تحميل الاواجهة اللاسلكية؛ إعداد الشبكة اللاسلكية مفقود"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "أمن اللاسلكي"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية الأمنية"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "يوجد ملف بالاسم \"%s\" مسبقاً"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ا_ستبدل"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "هل تريد استبدال %s مكان اتصال VPN الذي تحفظه"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "لا يمكن تصدير اتصال ال VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3807,452 +4173,415 @@ msgid ""
 "Error: %s."
 msgstr " اتصال VPN %s لا يمكن تصديره الى %s. الخطأ:%s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "صدّر اتصال VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "ا_فتح"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "معلومات الاتصال"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "الاتصالات الشبكية النشطة"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "اختر شهادتك الشخصية..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "المفتاح ال_سري:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "كل_مة سر المفتاح السري:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "اختر شهادتك الشخصية..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "شهادة المست_خدم:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "اتصالك عبر شبكة المحمول مضبوط بالإعدادات التالية:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "جهازك:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "مزود الخدمة:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "نظام الدفع:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"سيُنشأ الآن اتصال بمزود الخدمة طبقا للإعدادات التي اخترتها. إذا فشل الاتصال "
-"أو لم تستطع الوصول إلى الإنترنت، فراجع الإعدادات. لتغيير الإعدادات اختر "
-"\"الاتصالات الشبكية\" من قائمة \"نظام ← تفضيلات\"."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "بلدي ليست في القائمة"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ليس في القائمة"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ا_ختر نظام الدفع:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "اسم نق_طة اتصال (APN) نظام الدفع المختار:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"تحذير: اختيار نظام دفع خطأ قد يؤدي إلى مشاكل في حساب تكاليف الاتصال أو قد "
-"يعطل الاتصال تماما.\n"
-"\n"
-"إذا لم تكن متأكدا من نظام الدفع فراجع مقدم الخدمة للحصول على اسم نقطة "
-"الاتصال (APN)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "اختر نظام الدفع"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ليس في القائمة..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "اختر مقدم الخدمة من ال_قائمة:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "مقدم الخدمة"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "مقدم الخدمة:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS،HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "اختر مقدم الخدمة"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "قائمة البلدان والمناطق:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "البلد أو المنطقة"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "بلدي ليست في القائمة"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "اختر بلد أو منطقة مقدم الخدمة"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "جهاز GSM مثبّت"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "جهاز CDMA مثبّت"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "أي جهاز"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "اتصال شبكة هاتف محمول جديد..."
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "يساعدك هذا المعالج على إعداد اتصال بشبكة هاتف محمول."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ستحتاج المعلومات التالية:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "اسم مقدم الخدمة"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "نظام الدفع"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(أحيانا) اسم نقطة اتصال (APN) نظام الدفع"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "أنشئ ا_تصالا لجهاز شبكة الهاتف المحمول:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "أي جهاز"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "اضبط اتصال شبكة هاتف محمول"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "اتصال شبكة هاتف محمول جديد..."
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "البلد أو المنطقة"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "اختر بلد أو منطقة مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "اختر مقدم الخدمة من ال_قائمة:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS،HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "اختر مقدم الخدمة"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ا_ختر نظام الدفع:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "اسم نق_طة اتصال (APN) نظام الدفع المختار:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"تحذير: اختيار نظام دفع خطأ قد يؤدي إلى مشاكل في حساب تكاليف الاتصال أو قد "
+"يعطل الاتصال تماما.\n"
+"\n"
+"إذا لم تكن متأكدا من نظام الدفع فراجع مقدم الخدمة للحصول على اسم نقطة "
+"الاتصال (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "اختر نظام الدفع"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "اتصالك عبر شبكة المحمول مضبوط بالإعدادات التالية:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "جهازك:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "مزود الخدمة:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "نظام الدفع:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"سيُنشأ الآن اتصال بمزود الخدمة طبقا للإعدادات التي اخترتها. إذا فشل الاتصال "
+"أو لم تستطع الوصول إلى الإنترنت، فراجع الإعدادات. لتغيير الإعدادات اختر "
+"\"الاتصالات الشبكية\" من قائمة \"نظام ← تفضيلات\"."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(لا شيء)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "مجهول"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "اختر ملفًا"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "اختر ملفًا"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "اختر شهادتك الشخصية..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "شهادة المست_خدم:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "ا_فتح"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "عبارة السر للشبكة اللاسلكية %s"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "ا_طلب كلمة السر هذه في كل مرة"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "كلمة سر مطلوبة للاتصال بشبكة الهاتف المحمول '%s'."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_كلمة السر:"
+msgid "Sh_ow passwords"
+msgstr "أظهر _كلمات السر"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_كلمة السر:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "أظهر _كلمات السر"
+msgid "_Secondary Password:"
+msgstr "_كلمة السر:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_كلمة السر:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "لا يوجد اتصال شبكي"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "بدون"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 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
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "أن_شئ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للاتصال بالشبكة اللاسلكية '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "أنشئ شبكة لاسلكيّة جديدة"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "شبكة لاسلكيّة جديدة"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "أدخل اسم الشبكة اللاسلكية التي تريد إنشائها."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصل بشبكة لاسلكية مخفية"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "شبكة لاسلكيّة مخفية"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4260,37 +4589,55 @@ msgid ""
 msgstr ""
 "أدخل اسم والإعدادات الأمنية للشبكة اللاسلكية المخفية التي تريد الاتصال بها."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "أمن ال_لاسلكي:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "الات_صال:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "المحول ال_لاسلكي:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "لم أجد مقدم الخدمة وأريد إدخال المعلومات ي_دويا:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "مقدم الخدمة:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "قائمة البلدان والمناطق:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "البلد أو المنطقة"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "سلكي"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4300,17 +4647,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "أمن ال_لاسلكي:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "اسم ال_شبكة:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "الات_صال:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "المحول ال_لاسلكي:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "الاستخدام:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4318,423 +4689,460 @@ msgstr ""
 "هذا البرنامج احد مكونات مدير الشبكة (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "غير مُفعّل"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "غير مُسجّل"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "شبكة منزلية (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "شبكة منزلية"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "يبحث"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "منع التسجيل"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "‏%s (تجوال %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "‏%s (تجوال)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "شبكة تجوال (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "شبكة تجوال"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "رمز PIN مطلوب"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "رمز PIN مطلوب لجهاز شبكة الهاتف المحمول"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "تجوال"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "إ_تّصالات VPN"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_هوية مجهولة:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "الاستيثاق"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_هوية مجهولة:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "الاستيثاق ال_داخلي:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "اختر شهادة \"سلطة شهادات\"..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "إصدارة 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "إصدارة 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "إصدارة _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "عبارة سر WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "أظهر عبارة السر"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ملف شهادة _سُلْطة استيثاق:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "ملف شهادة _سُلْطة استيثاق:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ا_لهوية:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "‏TLS عبر نفق"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP ‏(PEAP) محمي"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "الا_ستيثاق:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (المبدئي)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "فتح النظام"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "المفتاح المشروك"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (المبدئي)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "الم_فتاح:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "أظهر ال_مفتاح"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_فهرس WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ال_نوع:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (المبدئي)"
+
+#~ msgid "Ignored"
+#~ msgstr "متروك"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "فشل تحديث الاتصال السري بسبب خطأ مجهول."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "م_علومات الاتصال"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "لا يمكن استيراد اتصال ال VPN"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "مجهول"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "الاتصالات الشبكية النشطة"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "اختر شهادة \"سلطة شهادات\"..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "مدير الشبكة"
 
@@ -4773,15 +5181,6 @@ msgstr "ال_نوع:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #, fuzzy
 #~ msgid "FirewallD is not running."
 #~ msgstr "لا يعمل مدير الشبكات..."
@@ -4879,12 +5278,6 @@ msgstr "ال_نوع:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "‏DNS الثّانوي:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "‏DNS الثالثي:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "فعّل شبكة الهاتف المحمول WiMA_X"
 
@@ -4923,12 +5316,6 @@ msgstr "ال_نوع:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "متاح لكل المستخدمين"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "اتصل _تلقائيا"
-
-#~ msgid "_Import"
-#~ msgstr "ا_ستورد"
-
 #, fuzzy
 #~ msgid "Error saving connection"
 #~ msgstr "خطأ بحفظ الاتصال "
@@ -5044,12 +5431,6 @@ msgstr "ال_نوع:"
 #~ "طرأ مشكل عند إنشاء حوار الاستيثاق للاتصال VPN من نوع '%s'. اتصل بمدير "
 #~ "نظامك."
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "فريق عربآيز للترجمة http://www.arabeyes.org :\n"
-#~ "جهاد عفيفي\t<djihed@gmail.com>\n"
-#~ "خالد حسني\t<khaledhosny@eglug.org>"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">الاتصالات النشطة</span>"
@@ -5262,10 +5643,6 @@ msgstr "ال_نوع:"
 #~ msgid "GSM connection %d"
 #~ msgstr "الإتّصال بالـ VPN '%s'"
 
-#, fuzzy
-#~ msgid "CDMA connection %d"
-#~ msgstr "الإتّصال بالـ VPN '%s'"
-
 #~ msgid "Existing wireless network"
 #~ msgstr "شبكة سلكية موجودة مسبقا"
 
@@ -5449,9 +5826,6 @@ msgstr "ال_نوع:"
 #~ msgid "Set _Password"
 #~ msgstr "كلمة السر:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "أظهر عبارة السر"
-
 #~ msgid "Orientation"
 #~ msgstr "الاتجاه"
 
diff --git a/po/as.po b/po/as.po
index 587e3505..0de92545 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-08-20 18:20+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
@@ -20,48 +21,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "নেটৱৰ্ক"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "আপোনাৰ নেটৱৰ্ক সংযোগসমূহ ব্যৱস্থাপনা কৰক"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "নেটৱৰ্ক সংযোগসমূহ"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "সক্ৰিয় নেটৱৰ্ক সংযোগসমূহ"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "আপোনাৰ নেটৱৰ্ক সংযোগক ব্যৱস্থাপনা আৰু সলনি কৰক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "সংযুক্ত অধিসূচনাসমূহ অসামৰ্থবান কৰক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "এটা নেটৱৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "বিচ্ছিন্ন হোৱাৰ অধিসূচনা অসামৰ্থবান কৰা হ'ব"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "এটা নেটৱৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
 "কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN অধিসূচনাসমূহ অসামৰ্থবান কৰক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -69,50 +79,51 @@ msgstr ""
 "এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে "
 "ইয়াক সত্যলে সংহতি কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "উপলব্ধ নেটৱৰ্কৰ অধিসূচনা প্ৰদৰ্শন লুকুৱা হ'ব"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "যেতিয়া Wi-Fi নেটৱৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
 "সংহতি কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "স্টেম্প"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "নতুন সংস্কৰণত সংহতিসমূহ প্ৰব্ৰজন কৰা হ'ব নে নহয় নিৰ্ধাৰণ কৰিবলৈ ইয়াক ব্যৱহাৰ কৰা হয়।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi সৃষ্টি অসামৰ্থবান কৰক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে সংহতি "
 "কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "এপ্লেটক অধিসূচনা স্থানত দেখুৱাওক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "এপ্লেটক অধিসূচনা স্থানত প্ৰদৰ্শন অসামৰ্থবান কৰিবলে FALSE লৈ সংহত।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA প্ৰমাণপত্ৰ উপেক্ষা কৰক"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -120,7 +131,7 @@ msgstr ""
 "EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
 "সংহতি কৰক।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -128,130 +139,143 @@ msgstr ""
 "EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান কৰিবলে "
 "ইয়াক সত্যলে সংহতি কৰক।"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "নেটৱৰ্ক পৰিড্ৰাইভাৰ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "কোনো নেটৱৰ্ক সংযোগ নাই"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager এপ্লেট"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "সংযোগ কৰা (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "নেটৱৰ্কৰ নাম (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "সংযোগ যোগ/সক্ৰিয় কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "অজ্ঞাত ত্ৰুটি"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "সংযোগ ব্যৰ্থতা"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ডিভাইচ বিচ্ছিন্ন কৰা ব্যৰ্থ হল"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "বিচ্ছিন্ন কৰা ব্যৰ্থ হল"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "সংযোগ সক্ৰিয়কৰণ ব্যৰ্থ হল"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "এই বাৰ্তা আকৌ নেদেখুৱাব"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -261,7 +285,7 @@ msgstr ""
 "\n"
 "নেটৱৰ্ক সংযোগ বাধাগ্ৰস্থ হোৱা বাবে VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -271,7 +295,7 @@ msgstr ""
 "\n"
 "নেটৱৰ্ক সংযোগ বিঘ্নিত হোৱাৰ ফলত VPN সংযোগ '%s' বিফল হৈছে।"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,7 +304,7 @@ msgstr ""
 "\n"
 "VPN সেৱা অপ্ৰত্যাশিতভাবে বন্ধ হোৱাৰ ফলত VPN সংযোগ '%s' বিফল হৈছে।"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ '%s' ব্যৰ্থ হল কাৰণ VPN সেৱায় অবৈধ সংৰূপ ঘুৰাই দিছিল।"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "\n"
 "সংযোগ চেষ্টা সময় অন্ত হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ সময়মতে আৰম্ভ নহোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "VPN সেৱা আৰম্ভ হবলে ব্যৰ্থ হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "কোনো বৈধ VPN গোপন তথ্য নথকা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "অবৈধ VPN গোপন তথ্যৰ বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -355,19 +379,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN সংযোগ সফলভাৱে স্থাপন কৰা হৈছে।\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN লগিন বাৰ্তা"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN সংযোগ ব্যৰ্থ হল"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -380,7 +404,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -393,561 +417,586 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ডিভাইচ প্ৰস্তুত নহয় (ফাৰ্মৱেৰ সন্ধানহীন)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ডিভাইচ প্ৰস্তুত নহয়"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "বিচ্ছিন্নিত"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ডিভাইচ ব্যৱস্থাপিত নহয়"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "কোনো নেটৱৰ্ক ডিভাইচ উপলব্ধ নাই"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN সংযোগসমূহ (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN সংৰূপণ কৰক (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN সংযোগসমূহ (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager চলি থকা নাই..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "নেটৱাৰ্কিং অসামৰ্থবান"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "নেটৱাৰ্কিং সামৰ্থবান কৰক (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi সামৰ্থবান কৰক (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "ম'বাইল ব্ৰডবেণ্ড সক্ৰিয় কৰক (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "অধিসূচনাসমূহ সামৰ্থবান কৰক (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "সংযোগ তথ্য (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "সংযোগসমূহ সম্পাদন কৰক..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "বিষয়ে (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "আপুনি এতিয়া '%s' লৈ সংযুক্ত।"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "বিচ্ছিন্নিত"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "নেটৱৰ্ক সংযোগ বিচ্ছিন্ন কৰা হৈছে।"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "নেটৱৰ্ক সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' ৰ কাৰণে নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN সংযোগ '%s' আৰম্ভ কৰা হৈছে..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' ৰ বাবে এটা VPN ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "কোনো নেটৱৰ্ক সংযোগ নাই"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager এপ্লেট"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ভুল PUK ক'ড; অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ভুল PIN ক'ড; অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "আনলক কৰাৰ ক'ড পঠিওৱা হৈছে..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "উপলব্ধ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "সংযোগ স্থাপিত"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "আপুনি এতিয়া ম'বাইল ব্ৰডবেণ্ড নেটৱৰ্কৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড নেটৱৰ্ক।"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "আপুনি এতিয়া ঘৰ নেটৱৰ্কত ৰেজিস্টাৰ্ড।"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "আপুনি এতিয়া এটা ৰ'মিং নেটৱৰ্কত ৰেজিস্টাৰ্ড।"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "আপুনি এতিয়া ম'বাইল ব্ৰডবেণ্ড নেটৱৰ্কৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সৃষ্টি কৰা হৈছে..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "স্বচালিত ইথাৰনেট"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ইথাৰনেট নেটৱৰ্কসমূহ (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ইথাৰনেট নেটৱৰ্ক (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ইথাৰনেট নেটৱৰ্কসমূহ"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ইথাৰনেট নেটৱৰ্ক"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "আপুনি এতিয়া ইথাৰনেট নেটৱৰ্কলৈ সংযুক্ত।"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' ৰ কাৰণে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' ৰ বাবে এটা ইথাৰনেট নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL প্ৰমাণীকৰণ"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(শূণ্য)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "নতুন সংযোগ যোগ কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi নেটৱৰ্কসমূহ (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi নেটৱৰ্ক (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi নেটৱৰ্ক"
 msgstr[1] "Wi-Fi নেটৱৰ্কসমূহ"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi অসামৰ্থবান আছে"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান কৰা আছে"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "অতিৰিক্ত নেটৱৰ্ক"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi নেটৱৰ্ক উপলব্ধ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "এটা Wi-Fi নেটৱৰ্কলে সংযোগ কৰিবলে নেটৱৰ্ক মেনু ব্যৱহাৰ কৰক"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "আপুনি এতিয়া Wi-Fi নেটৱৰ্ক '%s' ৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' ৰ কাৰণে এটা Wi-Fi নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "সংযোগ সক্ৰিয় কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "সঠিক তথ্য দেখুৱাওঁতে ত্ৰুটি:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ডাইনামিক WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "ঠিকনাসমূহ"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (অবিকল্পিত)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ঠিকনা"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "প্ৰচাৰ ঠিকনা"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "চাবনেট মাস্ক"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "প্ৰাথমিক (_P):"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "দ্বিতীয় DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ত্ৰয়াত্মক DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ইথাৰনেট (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "সাধাৰণ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "আন্তঃপৃষ্ঠ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "হাৰ্ডৱেৰ ঠিকনা"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ড্ৰাইভাৰ"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "গতি"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "সুৰক্ষা:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "অবিকল্পিত পথ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "উপেক্ষা কৰা হৈছে"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "পাছৱৰ্ড:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN ধৰণ"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN গেইটৱে"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN ব্যৱহাৰকাৰীনাম"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN বেনাৰ"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ভিত্তি সংযোগ"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "কোনো বৈধ সক্ৰিয় সংযোগ চিনাক্ত কৰা নাযায়!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -955,49 +1004,53 @@ msgstr ""
 "স্বত্বাধিকাৰ © ২০০৫-২০০৮ Novell, Inc.\n"
 "আৰু অন্য বহুতো সম্প্ৰদায়ৰ অৱদানকাৰী আৰু অনুবাদকসকল"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "আপোনাৰ নেটৱৰ্ক ডিভাইচ আৰু সংযোগসমূহ ব্যৱস্থাপনাৰ বাবে অধিসূচনা স্থানৰ এপ্লেট।"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager ৱেবছাইট"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 "NetworkManager এপ্লেটে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "অনুপস্থিত সম্পদ"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড নেটৱৰ্কৰ পাছৱৰ্ড"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱৰ্ডৰ প্ৰয়োজন।"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "পাছৱৰ্ড:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN আনলক কৰা প্ৰয়োজন"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN আনলক কৰা প্ৰয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1006,25 +1059,25 @@ msgstr ""
 "'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PIN ক'ড উপলব্ধ থকা আৱশ্যক।"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN ক'ড:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN ক'ড দেখুৱাওক"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK আনলক কৰা প্ৰয়োজন"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK আনলক কৰা প্ৰয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1033,35 +1086,42 @@ msgstr ""
 "'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PUK ক'ড উপলব্ধ থকা আৱশ্যক।"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK ক'ড:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "নতুন PIN ক'ড:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "নতুন PIN ক'ড পুনঃ লিখক:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "সংযোগ তথ্য"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1070,57 +1130,57 @@ msgstr ""
 "IP ঠিকনাসমূহে আপোনাৰ কমপিউটাৰক নেটৱৰ্কত চিনাক্ত কৰে। এটা IP ঠিকনা যোগ কৰিবলে "
 "\"যোগ কৰক\" বুটাম ক্লিক কৰক।"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "মচি পেলাওক (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "স্বচালিতভাৱে প্ৰাপ্ত পথসমূহ উপেক্ষা কৰক (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "এই সংযোগক কেৱল ইয়াৰ নেটৱৰ্কৰ সম্পসমূহৰ বাবে ব্যৱহাৰ কৰক (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "যদি সামৰ্থবান, এই সংযোগক কেতিয়াও অবিকল্পিত নেটৱৰ্ক সংযোগ হিচাপে ব্যৱহাৰ কৰা নহব।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "সৃষ্টি কৰক..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "এটা সংযোগ ধৰণ বাছক"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1132,85 +1192,100 @@ msgstr ""
 "যদি আপুনি এটা VPN সৃষ্টি কৰি আছে, আৰু আপুনি সৃষ্টি কৰিব বিচৰা VPN সংযোগ তালিকাত "
 "নাথাকে, আপোনাৰ হয়তো সঠিক VPN প্লাগিন ইনস্টল নাই।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "সেৱা (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "সক্ৰিয় বেকআপ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "প্ৰচাৰ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "এডাপ্টিভ ট্ৰান্সমিট ল'ড বেলেন্সিং"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "এডাপ্টিভ ল'ড বেলেন্সিং"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (উপদেশিত)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "বান্ধীত সংযোগসমূহ (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "অৱস্থা (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "সম্পাদনা কৰক (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "কম্পনাংক পৰ্যবেক্ষণ কৰা (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "আন্তঃপৃষ্ঠৰ নাম (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "লিংকৰ পৰ্যবেক্ষণ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP লক্ষ্যসমূহ (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1218,19 +1293,22 @@ msgstr ""
 "লিংকৰ অৱস্থা নিৰীক্ষণ কৰোতে চাব লগিয়া এটা IP ঠিকনা, অথবা IP ঠিকনাসমূহৰ এটা কমা-"
 "পৃথকিত তালিকা।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "লিংক আপ বিলম্ব (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "লিংক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "প্ৰাথমিক (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1238,105 +1316,163 @@ 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MTU (_M):"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "বাইটসমূহ"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "পথৰ মূল্য (_c):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "প্ৰাথমিকতা (_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "হেয়াৰপিন অৱস্থা (_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "ব্ৰিজ সংযোগসমূহ (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "আগবঢ়োৱাৰ বিলম্ব (_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "হেলো সময় (_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "নেটৱাৰ্কিং সামৰ্থবান কৰক (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (স্পেনিং ট্ৰি প্ৰটোকল) সামৰ্থবান কৰক (_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "সৰ্বাধিক আয়ু (_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "বাৰ্ধক্যৰ সময় (_A):"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "স্বচালিত"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "অবিকল্পিত"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "সামৰ্থবান কৰক"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1347,195 +1483,236 @@ msgstr ""
 "হিচাপে ব্যৱহাৰ কৰা হব। এই বৈশিষ্টক MAC ক্লৌনিং অথবা স্পুফিং হিচাপে জনা যায়। "
 "উদাহৰণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ঠিকনা"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ঠিকনা"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN আন্তঃপৃষ্ঠৰ নাম (_n):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "হাৰ্ডৱেৰ ঠিকনা:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "যিকোনো ডিভাইচ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "এটা অজ্ঞাত ত্ৰুটিৰ বাবে সংযোগ গোপনসমূহ আপডেইট কৰিবলে ব্যৰ্থ।"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "এই সংযোগৰ বাবে তথ্য কেন্দ্ৰ ব্ৰিজিং (DCB) ব্যৱহাৰ কৰক"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "ফ্ল নিয়ন্ত্ৰণ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "বৈশিষ্ট্য"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "সামৰ্থবান কৰক"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "প্ৰচাৰ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "ইচ্ছুক"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "প্ৰাথমিকতা"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "বিকল্পসমূহ..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "প্ৰাথমিকতা দলসমূহ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "ফেব্ৰিক"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "প্ৰাথমিকতা ফ্ল নিয়ন্ত্ৰণ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "প্ৰতিটো ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে প্ৰাথমিকতা বিৰাম পৰিবহন সামৰ্থবান অথবা "
 "অসামৰ্থবান কৰক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "প্ৰাথমিকতা:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "ট্ৰাফিক ক্লাচ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "স্ট্ৰিক্ট বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "প্ৰাথমিকতা বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "দল বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "দল ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে প্ৰাথমিকতা দল ID সুমুৱাওক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1543,246 +1720,308 @@ msgstr ""
 "প্ৰতিটো প্ৰাথমিকতা দলে ব্যৱহাৰ কৰিব পৰা অনুমোদিত লিঙ্ক বেণ্ডৱাইড্থ শতাংশ সুমুৱাওক। "
 "সকলো দলৰ যোগফল সৰ্বমুঠ ১০০% হব লাগিব।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "প্ৰত্যকজন ব্যৱহাৰকাৰীয়ে প্ৰাথমিকতা ব্যৱহাৰ কৰিব পৰা প্ৰাথমিকতা দল বেণ্ডৱাইড্থৰ শতাংশ "
 "সুমুৱাওক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে স্ট্ৰিক্ট বেণ্ডৱাইড্থ সামৰ্থবান অথবা অসামৰ্থবান "
 "কৰক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে ট্ৰাফিক ক্লাচ সুমুৱাওক।"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ব্যৱহাৰকাৰীৰ নাম (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "সেৱা (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "পাছৱৰ্ড দেখুৱাওক (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "পাছৱৰ্ড (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "আন্তঃপৃষ্ঠ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "স্বচালিত"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "টুইস্টেড পেয়াৰ (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "এটাচমেন্ট একক আন্তঃপৃষ্ঠ (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "মাধ্যম মুক্ত আন্তঃপৃষ্ঠ (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "উপেক্ষা কৰক"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "হস্তচালিত"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "পৰ্ট (_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "সেৱা (_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "ক্লৌন্ড MAC ঠিকনা (_l):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "অবিকল্পিত"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "উপেক্ষা কৰক"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "প্ৰচাৰ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "গতি (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "সম্পূৰ্ণ ডুপ্লেক্স (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "এই সংযোগ ব্যৱহাৰ কৰি থাকোতে স্বচালিতভাৱে VPN ৰ সৈতে সংযোগ কৰক (_V)"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "কোনো নহয়"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "সকলো ব্যৱহাৰকাৰীয়ে এই নেটৱৰ্কৰ সৈতে সংযোগ কৰিব পাৰিব (_u)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "যেতিয়া উপলব্ধ এই নেটৱৰ্কৰ সৈতে স্বচালিতভাৱে সংযোগ কৰক (_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "এই সংযোগ ব্যৱহাৰ কৰি থাকোতে স্বচালিতভাৱে VPN ৰ সৈতে সংযোগ কৰক (_V)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "সংযোগ তথ্য (_I)"
+msgid "Firewall _zone"
+msgstr "ফায়াৰৱাল অঞ্চল (_z):"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "দলবদ্ধ সংযোগসমূহ (_T):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "স্বচালিতভাবে সংযোগ কৰা হ'ব (_a)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "ফায়াৰৱাল অঞ্চল (_z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1791,7 +2030,7 @@ msgstr ""
 "IP ঠিকনাসমূহে আপোনাৰ কমপিউটাৰক নেটৱৰ্কত চিনাক্ত কৰে। এটা IP ঠিকনা যোগ কৰিবলে "
 "\"যোগ কৰক\" বুটাম ক্লিক কৰক।"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1799,128 +2038,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "স্বচালিত, কেৱল ঠিকনা"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "ঠিকনাসমূহ"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "পৰিবহন অৱস্থা (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ডাটাগ্ৰাম"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "সংযুক্ত"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "পৰিবহন অৱস্থা (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ডিভাইচ নাম + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ইথাৰনেট"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "অৱস্থা (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "হস্তচালিত DNS সংহতিসমূহৰ সৈতে স্বচালিত"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "সংযোগ-স্থানীয়"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "অন্য কমপিউটাৰৰ সৈতে অংশীদাৰী কৰা আছে"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "পদ্ধতি (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1930,8 +2173,8 @@ msgstr ""
 "DHCP ক্লাএন্ট পৰিচয়কৰ সহায়ত নেটৱৰ্ক প্ৰশাসকে আপোনাৰ কমপিউটাৰৰ সংৰূপ নিৰ্ধাৰণ "
 "কৰিবলৈ পাৰিব।  DHCP ক্লাএন্ট পৰিচয়কৰ ব্যৱহাৰ কৰিবলৈ ইচ্ছুক হ'লে সেইটো ইয়াত লিখক।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1939,25 +2182,26 @@ msgstr ""
 "হস্ট নাম বিশ্লেষণ কৰাৰ বাবে ব্যৱহৃত ডোমেইন। একাধিক ডোমেইন চিহ্নিত কৰাৰ সময়ত কমা "
 "চিহ্ন প্ৰয়োগ কৰা হ'ব।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP ক্লাএন্ট ID (_H):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "ডমেইনসমূহ সন্ধান কৰক (_e):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS চাৰ্ভাৰসমূহ (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1965,11 +2209,11 @@ msgstr ""
 "হস্ট নাম বিশ্লেষণ কৰাৰ বাবে ব্যৱহৃত ডোমেইন নাম চাৰ্ভাৰৰ IP ঠিকনা। একাধিক ডোমেইন "
 "নাম চাৰ্ভাৰৰ ঠিকনা চিহ্নিত কৰাৰ সময় কমা চিহ্ন প্ৰয়োগ কৰা হ'ব।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "এই সংযোগ সম্পূৰ্ণ হবলে IPv4 ঠিকনাৰ প্ৰয়োজন (_4)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1977,25 +2221,35 @@ msgstr ""
 "IPv6 ৰ সৈতে সুসঙ্গত নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে যদি IPv4 "
 "সংৰূপ বিফল হয় কিন্তু IPv6 সংৰূপ সফল হয়।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "পথসমূহ (_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "অসামৰ্থবান"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "সামৰ্থবান (পছন্দৰ ৰাজহুৱা ঠিকনা)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "সামৰ্থবান (পছন্দৰ অস্থায়ী ঠিকনা)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "সামৰ্থবান কৰক"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2005,15 +2259,20 @@ msgstr ""
 "ডমেইন নাম চাৰ্ভাৰৰ ঠিকনাসমূহ পৃথক কৰোতে কমা চিহ্ন প্ৰয়োগ কৰিব। স্থানীয়-সংযোগ "
 "ঠিকনাসমূহক সংযোগ কৰি থকা আন্তঃপৃষ্ঠলৈ স্বচালিতভাৱে অৱকাশ কৰা হব।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6 গোপনীয়তা সম্প্ৰসাৰনসমূহ (_p):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "এই সংযোগ সম্পূৰ্ণ হবলে IPv6 ঠিকনাৰ প্ৰয়োজন (_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2021,755 +2280,862 @@ msgstr ""
 "IPv4 ৰ সৈতে সুসঙ্গত নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে যদি IPv4 "
 "সংৰূপ বিফল হয় কিন্তু IPv4 সংৰূপ সফল হয়।"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "মেট্ৰিক"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "ইমপোৰ্ট কৰক (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "মৌলিক"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "সংখ্যা (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "নেটৱৰ্কৰ ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "পৰিবৰ্তন কৰক..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "PIN (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "ঘৰ নেটৱৰ্ক উপস্থিত নাথাকিলে ৰ'মিংৰ অনুমতি দিয়ক (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "প্ৰমাণীকৰণ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "অনুমোদিত পদ্ধতিসমূহ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "পদ্ধতিসমূহ সংৰূপণ কৰক (_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "সংকোচন"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "বিন্দুৰ-পৰা-বিন্দু ইনক্ৰিপষণ ব্যৱহাৰ কৰক (MPPE) (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-bit ইনক্ৰিপষণৰ প্ৰয়োজন (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "অৱস্থাপূৰ্ণ MPPE ব্যৱহাৰ কৰক (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD তথ্য সংকোচনৰ অনুমতি দিয়ক (_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "ডিফ্লেইট তথ্য সংকোচনৰ অনুমতি দিয়ক (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP হেডাৰ সংকোচন ব্যৱহাৰ কৰক (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP echo পেকেটসমূহ পঠাওক (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "পদ্ধতি (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক (_I)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "পদ্ধতি (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "উন্নত"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ইথাৰনেট নেটৱৰ্কসমূহ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "প্ৰাথমিকতা (_P):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "প্ৰাথমিকতা (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "প্ৰাথমিকতা (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "ব্যক্তিগত কি' (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "লিংক আপ বিলম্ব (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "লিংক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP লক্ষ্যসমূহ (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP লক্ষ্যসমূহ (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক (_I)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "JSON সংৰূপ (_J):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "দল বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "প্ৰাথমিকতা"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ইথাৰনেট"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "দলবদ্ধ সংযোগসমূহ (_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ইথাৰনেট"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "হাৰ্ডৱেৰ ঠিকনা:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "হাৰ্ডৱেৰ ঠিকনা:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "প্ৰাথমিকতা (_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "পৰিবহন শক্তি (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "পৰিবহন শক্তি (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN আন্তঃপৃষ্ঠৰ নাম (_n):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "ক্লৌন্ড MAC ঠিকনা (_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN আইডি (_i):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ডিভাইচ নাম + সংখ্যা"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "সুৰক্ষা (_e):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "পৰিবহন শক্তি (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "হাৰ (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "চেনেল (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "বেণ্ড (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SSID (_I):"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "অনুমোদিত প্ৰমাণীকৰণ পদ্ধতিসমূহ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "প্ৰসাৰনযোগ্য প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "পাছৱৰ্ড প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক প্ৰত্যাহ্বান জনাওক"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডছেইক প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক সংস্কৰণ ২"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2778,241 +3144,234 @@ msgstr ""
 "বেছিৰভাগ ক্ষেত্ৰত, প্ৰদানকাৰীৰ PPP চাৰ্ভাৰসমূহে সকলো প্ৰমাণীকৰণ পদ্ধতি সমৰ্থন কৰিব। "
 "যদি সংযোগসমূহ ব্যৰ্থ হব, কিছুমান পদ্ধতিৰ বাবে সমৰ্থন অসামৰ্থবান কৰি চাওক।"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "ব্লুটুথ"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "বান্ধনী"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "দল"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ব্ৰিজ"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN প্লাগ-ইন দ্বাৰা সঠিকভাবে VPN সংযোগ ইমপোৰ্ট কৰা সম্ভৱ নহয়\n"
-"\n"
-"ত্ৰুটি: কোনো VPN সেৱাৰ ধৰণ উপলব্ধ নহয়।"
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN সংযোগ ইমপোৰ্ট কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"'%s' ফাইল পঢ়া নাযায় বা ফাইলত কোনো পৰিচিত VPN সংযোগৰ তথ্য উপস্থিত নাই\n"
+"VPN প্লাগ-ইন দ্বাৰা সঠিকভাবে VPN সংযোগ ইমপোৰ্ট কৰা সম্ভৱ নহয়\n"
 "\n"
-"ত্ৰুটি: %s।"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "অজ্ঞাত ত্ৰুটি"
+"ত্ৰুটি: কোনো VPN সেৱাৰ ধৰণ উপলব্ধ নহয়।"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ইমপোৰ্ট কৰিবলৈ ফাইল বাছক"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "হাৰ্ডৱেৰ"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "ভাৰছুৱেল"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "এটা সংৰক্ষিত VPN সংৰূপ ইমপোৰ্ট কৰক..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "অজ্ঞাত কাৰণে সংযোগ সম্পাদন ব্যৱস্থাৰ বাৰ্তা আৰম্ভ কৰা নাযায়।"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "নতুন সংযোগ সৃষ্টি কৰা সম্ভৱ নহয়"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "সংযোগ মচিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "আপুনি নিশ্চিতৰূপে %s সংযোগ মচিবলে ইচ্ছুক নে?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN সংযোগসমূহ (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ঠিকনা"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "নেটমাস্ক"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "গেইটৱে"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "মেট্ৰিক"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "উপসৰ্গ"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s সম্পাদন"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "নামবিহীন সংযোগ সম্পাদন"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "সংযোগৰ নাম (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "সম্পাদন ব্যৱস্থা আৰম্ভ কৰিবলৈ ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "সংযোগ সম্পাদকে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "সংৰক্ষণ কৰক (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "এই সংযোগলে কৰা যিকোনো পৰিবৰ্তন সংৰক্ষণ কৰক।"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "এই ডিভাইচৰ সকলো ব্যৱহাৰকাৰীৰ বাবে এই সংযোগ সংৰক্ষণ কৰাৰ বাবে প্ৰমাণীত কৰক।"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "সংযোগ সৃষ্টি কৰিব পৰা নগল"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "সংযোগ সম্পাদন কৰা সম্ভৱ নহয়"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "সংযোগ সম্পাদক ডাইলগ সৃষ্টি কৰোতে অজ্ঞাত ত্ৰুটি।"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "সম্পাদন ব্যৱস্থা আৰম্ভ কৰিবলৈ ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3021,201 +3380,247 @@ msgstr ""
 "EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
 "সংহতি কৰক।"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "সংযোগৰ নাম (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "এক্সপোৰ্ট কৰক (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "লেবেল"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "লেবেল"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "কেতিয়াও নহয়"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "এতিয়া"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট আগতে"
 msgstr[1] "%d মিনিট আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন্টা আগতে"
 msgstr[1] "%d ঘন্টা আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন আগতে"
 msgstr[1] "%d দিন আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাহ আগতে"
 msgstr[1] "%d মাহ আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d বছৰ আগতে"
 msgstr[1] "%d বছৰ আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "দল সংযোগ %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "দল সংযোগ %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "নাম"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "সৰ্বশেষ ব্যৱহৃত"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰক"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ মচি পেলাওক"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ মচি পেলোৱাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগৰ ধৰণ সমৰ্থিত নহয়।"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "'%s' সংযোগসমূহ কিদৰে সৃষ্টি কৰা হব জ্ঞাত নহয়"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "সংযোগ সৃষ্টি কৰোতে ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "কোনো VPN প্লাগিন ইনস্টল নাই।"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' সংযোগসমূহ কিদৰে সৃষ্টি কৰা হব জ্ঞাত নহয়"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' ৰ সৈতে এটা সংযোগ পোৱা নগল"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "নেটৱৰ্ক সংযোগসমূহ"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN সংযোগসমূহ (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X সুৰক্ষা"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "এই সংযোগৰ বাবে 802.1X সুৰক্ষা ব্যৱহাৰ কৰক (_X)"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "DCB ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ব্লুটুথ ডিভাইচ পোৱা নাযায়।"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "বান্ধনী সংযোগ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "ব্লুটুথ"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ইথাৰনেট নেটৱৰ্ক"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi নেটৱৰ্ক"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "বান্ধনী ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "প্ৰাথমিক (_P):"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "বান্ধনী সংযোগ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "ব্ৰিজ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ব্ৰিজ সংযোগ %d"
@@ -3223,32 +3628,37 @@ msgstr "ব্ৰিজ সংযোগ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "ব্ৰিজ পোৰ্ট"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "ব্ৰিজ পোৰ্ট ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL সংযোগ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3258,44 +3668,43 @@ msgstr ""
 "এই বিকল্পয় নেটৱৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা হৈছে "
 "তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "উপেক্ষা কৰা হৈছে"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ইথাৰনেট ব্যৱহাৰকাৰীৰ আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ইথাৰনেট"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "ক্লৌন্ড MAC ঠিকনা (_l):"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ইথাৰনেট সংযোগ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "অবিকল্পিত"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3305,11 +3714,11 @@ msgstr ""
 "নিৰ্বাচন কৰিলে ফায়াৰৱালত সংহিত অবিকল্পিত অঞ্চলৰ ব্যৱহাৰ হয়। কেৱল তেতিয়াহে "
 "ব্যৱহাৰযোগ্য যদি firewalld সক্ৰিয়। "
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "সাধাৰণ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3320,158 +3729,162 @@ msgstr ""
 "এই বিকল্পয় নেটৱৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা হৈছে "
 "তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand সংযোগ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ইথাৰনেট সংযোগ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "স্বচালিত (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "কেৱল স্বচালিত (VPN) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "স্বচালিত, কেৱল ঠিকনা"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "স্বচালিত (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "কেৱল স্বচালিত (PPPoE) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "স্বচালিত (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "কেৱল স্বচালিত (DHCP) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "কেৱল সংযোগ-স্থানীয়"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "অতিৰিক্ত DNS চাৰ্ভাৰসমূহ (_D):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "অতিৰিক্ত সন্ধান ডমেইনসমূহ (_e):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ৰ বাবে IPv4 পথবোৰ সম্পাদন কৰা"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "স্বচালিত, কেৱল DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ৰ বাবে IPv6 পথ সম্পাদন"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 ৰ সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX সংযোগ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "প্ৰতিলিপি স্লেইভসমূহ"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "স্লেইভ '%s' আৰু '%s' দুয়ো ডিভাইচ '%s' লৈ প্ৰযোজ্য নহয়"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3480,25 +3893,25 @@ msgstr ""
 "স্লেইভ '%s' আৰু '%s' একেটা ভৌতিক ডিভাইচৰ বিভিন্ন ভাৰছুৱেল পৰ্ট ('%s' আৰু '%s') লৈ "
 "প্ৰযোজ্য হয়।"
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s স্লেইভ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ম'বাইল ব্ৰডবেণ্ড ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগৰ ধৰণ সমৰ্থিত নহয়।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ম'বাইল ব্ৰডবেণ্ড উপলব্ধকৰ্তাৰ ধৰণ বাছক"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3507,7 +3920,7 @@ msgstr ""
 "ম'বাইল ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা ব্যৱহৃত সেৱা বাছক। এই তথ্য অজ্ঞাত থাকিলে, "
 "সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "মোৰ সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা GSM-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ GPRS, EDGE, "
@@ -3515,86 +3928,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ 1xRTT, "
 "EVDO) (_D)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "কোনো নহয়"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ৰ বাবে PPP প্ৰমাণীকৰণ পদ্ধতি সম্পাদন"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ৰ সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "বান্ধনী ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "ত্ৰুটি: ফাইলত এটা বৈধ JSON সংৰূপ নাই"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "দল ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "দল সংযোগ %d"
@@ -3602,69 +4011,69 @@ msgstr "দল সংযোগ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "দল পৰ্ট"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (\"%s\" ৰে)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "কোনো নেটৱৰ্ক সংযোগ নাই"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "vlan ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' ৰ বাবে VPN প্লাগ-ইন সেৱা পোৱা নাযায়।"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' ৰ বাবে VPN প্লাগ-ইন সেৱা পোৱা নাযায়।"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "সংযোগ ব্যৰ্থতা"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' ৰ বাবে VPN প্লাগ-ইন সেৱা পোৱা নাযায়।"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "এটা VPN সংযোগ ধৰণ বাছক"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3674,7 +4083,7 @@ msgstr ""
 "নতুন সংযোগৰ বাবে ব্যৱহাৰ কৰিব বিচৰা VPN ৰ ধৰণ বাছক। যদি আপুনি সৃষ্টি কৰিব বিচৰা "
 "VPN সংযোগ তালিকাত নাথাকে, আপোনাৰ হয়তো সঠিক VPN প্লাগিন ইনস্টল নাই।"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3683,7 +4092,7 @@ msgstr ""
 "এই বিকল্পই ইয়াত দিয়া BSSID এ নিৰ্ধাৰিত কৰাৰ মতে Wi-Fi অভিগম পইন্ট (AP) ত সংযোগক "
 "লক কৰে। যেনে: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3693,95 +4102,93 @@ msgstr ""
 "এই বিকল্পয় নেটৱৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা হৈছে "
 "তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "যিকোনো ডিভাইচ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi সংযোগ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit কি (Hex অথবা ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA আৰু WPA2 এন্টাৰপ্ৰাইজ"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ; Wi-Fi সংহতিসমূহ অনুপস্থিত।"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi সুৰক্ষা"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" নামৰ ফাইল ইতিমধ্যে আছে।"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "প্ৰতিস্থাপন কৰক (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "সংৰক্ষণৰ বাবে চিহ্নিত VPN সংযোগ সহায়ত %s ৰ প্ৰতিস্থাপন কৰা হ'ব নেকি?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN সংযোগ এক্সপোৰ্ট কৰা নাযায়"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3792,222 +4199,106 @@ msgstr ""
 "\n"
 "ত্ৰুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN সংযোগ এক্সপোৰ্ট কৰক..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "আনলক কৰক (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "এই ডিভাইচ স্বচালিতভাৱে আনলক কৰক"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "সংযোগ তথ্য"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "সক্ৰিয় নেটৱৰ্ক সংযোগসমূহ"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "ব্যক্তিগত কি' (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "নিম্নলিখিত সংহতিসমূহৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ সংৰূপণ কৰা হৈছে:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "আপোনাৰ ডিভাইচ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "আপোনাৰ পৰিকল্পনা:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
-"উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ ব্যৱহাৰ "
-"কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড সংযোগৰ "
-"সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক সংযোগ\" বাছক।"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "মোৰ দেশ তালিকাত নাই"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "তালিকা বহিৰ্ভূত"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "নিৰ্বাচিত পৰিকল্পনাৰ APN (এক্সেচ পইন্ট নেম) (_A):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"সতৰ্কবাৰ্তা: ভুল পৰিকল্পনা নিৰ্বাচন কৰিলে আপোনাৰ ব্ৰডবেণ্ড সংযোগৰ বিল আৰু সংযোগ "
-"স্থাপনত সমস্যা হ'ব।\n"
-"\n"
-"পৰিকল্পনা সম্পৰ্কে নিশ্চিত ন'হ'লে অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তা সৈতে যোগাযোগ কৰি "
-"আপোনাৰ ব্যৱহৃত পৰিকল্পনাৰ APN জানক।"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "তালিকাৰ পৰা সেৱা উপলব্ধকৰ্তাৰ নাম বাছক (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "সেৱা উপলব্ধকৰ্তা"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "সেৱা উপলব্ধকৰ্তা:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr ""
-"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "দেশ অথবা অঞ্চল তালিকা:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "দেশ অথবা অঞ্চল"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "মোৰ দেশ তালিকাত নাই"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "আপোনাৰ প্ৰদানকাৰীৰ দেশ অথবা অঞ্চল বাছক"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ইনস্টল কৰা GSM ডিভাইচ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "যিকোনো ডিভাইচ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4015,259 +4306,358 @@ msgstr ""
 "এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ "
 "স্থাপন কৰা যাব।"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "নিম্নলিখিত তথ্যৰ প্ৰয়োজন:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ নাম"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ব্ৰডবেণ্ড বিলিং পৰিকল্পনাৰ নাম"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(কিছু ক্ষেত্ৰত) আপোনাৰ ব্যৱহৃত ব্ৰডবেণ্ড বিলিং পৰিকল্পনা APN (এক্সেচ পইন্ট নেম)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "এই ম'বাইল ব্ৰডবেণ্ড ডিভাইচৰ বাবে সংযোগ সৃষ্টি কৰক (_t)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "যিকোনো ডিভাইচ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগ প্ৰস্তুত কৰক"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "দেশ অথবা অঞ্চল"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "আপোনাৰ প্ৰদানকাৰীৰ দেশ অথবা অঞ্চল বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "তালিকাৰ পৰা সেৱা উপলব্ধকৰ্তাৰ নাম বাছক (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "নিৰ্বাচিত পৰিকল্পনাৰ APN (এক্সেচ পইন্ট নেম) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"সতৰ্কবাৰ্তা: ভুল পৰিকল্পনা নিৰ্বাচন কৰিলে আপোনাৰ ব্ৰডবেণ্ড সংযোগৰ বিল আৰু সংযোগ "
+"স্থাপনত সমস্যা হ'ব।\n"
+"\n"
+"পৰিকল্পনা সম্পৰ্কে নিশ্চিত ন'হ'লে অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তা সৈতে যোগাযোগ কৰি "
+"আপোনাৰ ব্যৱহৃত পৰিকল্পনাৰ APN জানক।"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "নিম্নলিখিত সংহতিসমূহৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ সংৰূপণ কৰা হৈছে:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "আপোনাৰ ডিভাইচ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "আপোনাৰ পৰিকল্পনা:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
+"উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ ব্যৱহাৰ "
+"কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড সংযোগৰ "
+"সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক সংযোগ\" বাছক।"
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(শূণ্য)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA প্ৰমাণপত্ৰ (_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "অজ্ঞাত"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "এটা পঞ্জিকা নিৰ্বাচন কৰক"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "এটা CA প্ৰমাণপত্ৰ বাছক"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "ব্যৱহাৰকাৰী প্ৰমাণপত্ৰ (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "আনলক কৰক (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "পাছৱৰ্ডক কেৱল এই ব্যৱহাৰকাৰীৰ বাবে সংৰক্ষণ কৰক (_u)"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে পাছৱৰ্ড সংৰক্ষণ কৰক (_a)"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "প্ৰতিবাৰ এই পাছৱৰ্ড লিখাৰ অনুৰোধ কৰা হ'ব (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱৰ্ডৰ প্ৰয়োজন।"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "পাছৱৰ্ড (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "সৃষ্টি কৰক (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi নেটৱৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi নেটৱৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত Wi-Fi নেটৱৰ্কৰ এটা নাম নিৰ্ধাৰণ কৰক।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্ক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi সুৰক্ষা (_s):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "সংযোগ (_o):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi এডাপ্টাৰ (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "সেৱা উপলব্ধকৰ্তা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "দেশ অথবা অঞ্চল তালিকা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "দেশ অথবা অঞ্চল"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "তাঁৰযুক্ত"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC মেশ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4277,17 +4667,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi সুৰক্ষা (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "নেটৱৰ্কৰ নাম (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "সংযোগ (_o):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi এডাপ্টাৰ (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ব্যৱহাৰপদ্ধতি (_U):"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4295,7 +4707,7 @@ msgstr ""
 "এই প্ৰগ্ৰাম NetworkManager ৰ এটা উপাদান (https://wiki.gnome.org/Projects/"
 "NetworkManager/)।"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4303,412 +4715,478 @@ msgstr ""
 "ইয়াক কমান্ড-শাৰীৰ মাধ্যমে ব্যৱহাৰৰ বাবে নিৰ্মিত নহয় আৰু GNOME ডেস্কটপ পৰিবেশত "
 "সঞ্চালিত হয়।"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "সামৰ্থবান নহয়"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ৰেজিস্টাৰ্ড নহয়"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ঘৰৰ নেটৱৰ্ক (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ঘৰৰ নেটৱৰ্ক"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "অনুসন্ধান কৰা হৈছে"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ৰেজিস্ট্ৰেষণ নাকচ কৰা হৈছে"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ৰ'মিং)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ৰ'মিং)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ৰ'মিং নেটৱৰ্ক (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ৰ'মিং নেটৱৰ্ক"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%s' ত SIM কাৰ্ড '%s' ৰ বাবে PIN ক'ড"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN ক'ড প্ৰয়োজনীয়"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড ডিভাইচৰ কাৰণে PIN ক'ড প্ৰয়োজনীয়"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' ম'বাইল ব্ৰডবেণ্ড সংযোগ বৰ্তমানে সক্ৰিয়: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ৰ'মিং"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s সংযোগ"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER বা PEM প্ৰমাণপত্ৰসমূহ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, অথবা PKCS#12 ব্যক্তিগত কিসমূহ (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "এটা PAC ফাইল বাছক..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইলসমূহ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "সকলো ফাইল"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "বেনামী"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "প্ৰমাণীত"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "দুয়ো"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "বেনামী পৰিচয় (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC ফাইল (_f):"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "অভ্যন্তৰীক প্ৰমাণীকৰণ (_I):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বচালিত PAC যোগানৰ অনুমতি দিয়ক (_v)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "প্ৰমাণপত্ৰ কতৃপক্ষৰ প্ৰমাণপত্ৰ বাছক..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "সংস্কৰণ 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "সংস্কৰণ 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA প্ৰমাণপত্ৰ (_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP সংস্কৰণ (_v):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "পৰিচয় (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "টানেল কৰা TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "সুৰক্ষিত EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "প্ৰমাণীকৰণ (_t):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (অবিকল্পিত)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "খোলা চিস্টেম"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "অংশীদাৰী কৰা কি'"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (অবিকল্পিত)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "কি' (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "কি' দেখুৱাওক (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP সূচী (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ধৰণ (_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (অবিকল্পিত)"
+
+#~ msgid "Ignored"
+#~ msgstr "উপেক্ষা কৰা হৈছে"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "এটা অজ্ঞাত ত্ৰুটিৰ বাবে সংযোগ গোপনসমূহ আপডেইট কৰিবলে ব্যৰ্থ।"
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "যেতিয়া উপলব্ধ এই নেটৱৰ্কৰ সৈতে স্বচালিতভাৱে সংযোগ কৰক (_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "সংযোগ তথ্য (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN সংযোগ ইমপোৰ্ট কৰিবলৈ ব্যৰ্থ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' ফাইল পঢ়া নাযায় বা ফাইলত কোনো পৰিচিত VPN সংযোগৰ তথ্য উপস্থিত নাই\n"
+#~ "\n"
+#~ "ত্ৰুটি: %s।"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "অজ্ঞাত ত্ৰুটি"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "প্ৰমাণপত্ৰ কতৃপক্ষৰ প্ৰমাণপত্ৰ বাছক..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA প্ৰমাণপত্ৰ (_A):"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "নেটৱৰ্ক পৰিড্ৰাইভাৰ"
@@ -4742,30 +5220,6 @@ msgstr "ধৰণ (_T):"
 #~ 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"
 
@@ -5034,12 +5488,6 @@ msgstr "ধৰণ (_T):"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "কেৱল স্বচালিত (PPP) ঠিকনাসমূহ"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX সংযোগ %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5059,9 +5507,6 @@ msgstr "ধৰণ (_T):"
 #~ msgid "Error: %s"
 #~ msgstr "ত্ৰুটি: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "ব্যৱহাৰৰ বাবে আপোনাৰ ফোন এতিয়া প্ৰস্তুত!"
 
@@ -5103,18 +5548,9 @@ msgstr "ধৰণ (_T):"
 #~ msgid "%s Network"
 #~ msgstr "%s নেটৱৰ্ক"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "দ্বিতীয় DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ত্ৰয়াত্মক DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "সংৰক্ষণ কৰক (_S)..."
 
-#~ msgid "Connect _automatically"
-#~ msgstr "স্বচালিতভাবে সংযোগ কৰা হ'ব (_a)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে উপস্থিত"
 
@@ -5174,9 +5610,6 @@ msgstr "ধৰণ (_T):"
 #~ msgid "Wireless connection %d"
 #~ msgstr "বেতাঁৰ সংযোগ %d"
 
-#~ msgid "_Import"
-#~ msgstr "ইমপোৰ্ট কৰক (_I)"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "এটা অজ্ঞাত ত্ৰুটি হৈছে।"
 
@@ -5217,9 +5650,6 @@ msgstr "ধৰণ (_T):"
 #~ msgid "Unknown"
 #~ msgstr "অজ্ঞাত"
 
-#~ msgid "translator-credits"
-#~ msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
diff --git a/po/ast.po b/po/ast.po
index e2ba7788..83d9bca5 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-09-07 17:48+0200\n"
 "Last-Translator: Xandru Armesto <xandru@softastur.org>\n"
 "Language-Team: Softastur <alministradores@softastur.org>\n"
@@ -19,49 +20,58 @@ msgstr ""
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rede"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Remana les conexones de rede"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Conexones de rede"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Conexones de rede actives"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Xestiona y camuda los axustes de conexón de rede"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desactivar los avisos de conexón"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Conseñar como braero pa desactivar los avisos al coneutase a una rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desactivar los avisos de desconexón"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Conseñar como braero pa desactivar los avisos al desconeutase d'una rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Desactivar los avisos de conexón"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -69,11 +79,11 @@ msgid ""
 msgstr ""
 "Conseñar como braero pa desactivar los avisos al desconeutase d'una rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Torgar avisos de redes afayadices"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -81,181 +91,195 @@ msgstr ""
 "Conseñar como braero pa desactivar los avisos cuando hai redes inalámbriques "
 "afayadices."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Cuñu"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Usao p'afitar si hai que migrar los axustes a una versión nueva."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desactivar crear Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Conseñar braero pa desactivar la creación de redes adhoc al usar l'applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Escueyi el certificáu CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Xestor de la rede"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Nun hai conexón de rede"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Aplicación NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Autenticación cableada 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Coneutar"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Nome de _rede:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Fallu al crear la conexón PAN: %s"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "Desconocida"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Falló amestar conexón"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "desconeutáu"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Desconeutáu"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Falló amestar conexón"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Nun amosar esti mensax otra vegada"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "La conexón VPN «%s» desconeutóse porque torgóse la conexón de rede."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "La conexón CPN «%s» falló porque torgóse la conexón de rede."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -285,7 +309,7 @@ msgstr ""
 "la conexón de rede «%s» falló porque'l serviciu VPN  interrumpióse "
 "inesperadamente."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "La conexón VPN « %s » falló porque'l serviciu VPN devolvió una configuración "
 "inválida."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "La conexón VPN « %s » falló porque'l tiempu de conexón pasóse."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "La conexón VPN « %s » falló porque'l serviciu VPN nun arrancó a tiempu."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "La conexón VPN « %s » falló porque l'arranque del serviciu VPN falló."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "La conexón VPN « %s » falló porque nun había secretos VPN afayadizos."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "La conexón VPN « %s » falló por razones secretes VPN non afayadices."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -350,7 +374,7 @@ msgstr ""
 "\n"
 "La conexón VPN «%s» falló."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -358,19 +382,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mensaxe de Rexistru VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Falló la conexón VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -383,7 +407,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -396,582 +420,607 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "el preséu nun ta llistu (falta'l firmware)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "el preséu nun ta preparáu"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconeutáu"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desconeutar"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "el preséu nun ta remanáu"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nun hai preseos de rede disponibles"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Conexones _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Conexones _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager nun ta executándose…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Redes deshabilitaes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activar _Rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Activar _Inalámbrica"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la banda ancha _móvil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activar _notificaciones"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "I_nformación de la Conexón"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Editar les conexones…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "Tocante _a"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Agora ta coneutáu a «%s»."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconeutáu"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Desconeutóse la conexón a la rede."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Tresnando la conexón de rede «%s»…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Necesítase autenticación d'usuariu pa la conexón de rede «%s»…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Solicitando una direición de rede pa «%s»…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexón de rede «%s» activa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Aniciando conexón VPN «%s»…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Necesítase autenticación d'usuariu pa la conexón VPN «%s»…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Solicitando una direición VPN pa «%s»…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Conexón VPN «%s» activa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nun hai conexón de rede"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplicación NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Códigu PUK incorreutu; contauta col fornidor del to serviciu."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Códigu PIN incorreutu; contauta col fornidor del to serviciu."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Unviando códigu de desbloquéu…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ancha móvil (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Conexón de banda ancha móvil nueva"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Afitóse la conexón"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Agora tas coneutáu a la rede móvil de banda ancha."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Contraseña de la rede móvil de banda ancha"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Agora tas rexistráu a la rede de casa."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Agora tas rexistráu nuna rede de roaming."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Agora tas coneutáu a la rede móvil de banda ancha."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Tresnando la conexón móvil de banda ancha «%s»…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configurando la conexón móvil de banda ancha «%s»…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Necesítase autenticación d'usuariu pa la conexón móvil de banda ancha «%s»…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "La conexón móvil de banda ancha «%s» ta activa"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automático"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes cableaes (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede cableada (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Redes cableaes"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Rede cableada"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Agora tas coneutáu a la rede cableada."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Tresnando la conexón cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configurando la conexón de rede cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Necesítase autenticación d'usuariu pa la rede cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Solicitando una direición de rede inalámbrica pa «%s»…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "La conexón de rede cableada «%s» ta activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Coneutar a redes invisibles inalámbriques"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Crear Nueva Rede Wifi"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(dengún)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Nun pudo editase la conexón nueva"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes cableaes (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede cableada (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede cableada"
 msgstr[1] "Rede cableada"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX ta desactivada"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX ta desactivada pol interruptor físicu"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Más redes"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Redes Inalámbriques Disponibles"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Usar el menú de rede pa coneutase a una rede inalámbrica"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Agora tas coneutáu a la rede inalámbrica «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Tresnando la conexón de rede «%s»…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurando la conexón de rede cableada «%s»…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Necesítase autenticación d'usuariu pa la conexón de rede inalámbrica «%s»…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Solicitando una direición de rede pa «%s»…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "La conexón de rede inalámbrica a «%s» ta activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "La conexón de rede cableada «%s» ta activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Fallu al crear la conexón PAN: %s"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Fallu al amosar la información de conexón:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinámica"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Direiciones"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (Predetermináu)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconocida"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Direición IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Señes de Difusión"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mázcara de sorrede"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS primariu:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS secundariu:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS terciariu:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Xeneral"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Señes de Hardware"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocidá"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguridá:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Camín predetermináu"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Inoráu"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Contraseña:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "_Triba:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "Puerta d'enllaz"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "Nome d'_usuariu:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Co_nexón:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 #, fuzzy
 msgid "Unknown"
 msgstr "Desconocida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nun s'alcontró denguna conexón activa válida"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -979,18 +1028,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "y munchos otros contribuyentes y traductores"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplicación d'área de notificación p'alministrar los sos preseos de rede y "
 "conexones."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Páxina web de NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -998,33 +1051,33 @@ msgstr ""
 "La miniaplicación Xestor de rede nun fue a atopar dellos ficheros de "
 "recursos (nun s'atopó'l ficheru .ui)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Recursos que falten"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Contraseña de la rede móvil de banda ancha"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Necesítase una contraseña pa coneutar con «%s»"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Necesítase un códigu PIN de desbloquéu"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Necesítase un códigu PIN de desbloquéu"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1034,25 +1087,25 @@ msgstr ""
 "usalu."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Códigu PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Amosar códigu PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Necesítase un códigu PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Necesítase un códigu PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1062,35 +1115,42 @@ msgstr ""
 "usalu."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Códigu PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Códigu PIN nuevu:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Reintroduz el nuevu códigu PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Amosar los códigos 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Información de la conexón"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Fallu al crear la conexón DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1099,59 +1159,59 @@ msgstr ""
 "La direición IP identifica el to equipu na rede. Calca'l botón «Amestar» "
 "p'amestar una direición IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "D_esaniciar"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "I_norar caminos sacaos automáticamente"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Usar esta c_onexón sólo pa los recursos na so rede"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Si s'activa, esta conexón nunca va usase como conexón predeterminada de rede."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Crear…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Escoyer una triba de conexón VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1163,213 +1223,272 @@ msgstr ""
 "conexón VPN que quies crear nun apaez na llista, pue ser que nun tengas "
 "instaláu'l complementu de VPN correutu."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Serviciu:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Señes de Difusión:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Co_nexón:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_ou:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "DNS primariu:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_Seguridá:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Activar _Rede"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automáticu"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predetermináu"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1380,438 +1499,529 @@ msgstr ""
 "preséu de rede nel que s'activa esta conexón. Esta carauterística conozse "
 "como clonáu MAC o «spoofing». Exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Direición"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Direición"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Señes de Hardware:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Cualisquier preséu"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Fallu al actualizar los secretos de conexón por un error desconocíu."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Emplegar la seguridá 802.1X pa esta conexón"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nome d'_usuariu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Serviciu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "A_mosar la contraseña"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Contraseña:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interface"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automáticu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Par cruzáu (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Interfaz d'unidá d'acoplamientu (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Interfaz independiente de medios (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Inorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "_Puertu:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Serviciu:"
+msgid "_Port"
+msgstr "_Puertu:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Direición MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Contraseña de clave pri_vada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Predetermináu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Inorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Señes de Difusión:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Contraseña de clave pri_vada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocidá:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Denguna"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Agora tas coneutáu a la rede cableada."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "I_nformación de la Conexón"
+msgid "_Metered connection"
+msgstr "Co_nexón:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Coneutar _automáticamente"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1820,7 +2030,7 @@ msgstr ""
 "La direición IP identifica el to equipu na rede. Calca'l botón «Amestar» "
 "p'amestar una direición IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1828,119 +2038,121 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automáticu, namái direiciones"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Direiciones"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_Coneutar"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Serviciu:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automática con configuración manual de DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Enllaz-Llocal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 "Automáticu\n"
@@ -1949,12 +2161,13 @@ msgstr ""
 "Enllaz llocal\n"
 "Compartida con otros equipos"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Métodu:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1965,8 +2178,8 @@ msgstr ""
 "personalice la configuración del ordenador. Si quier usar un identificador "
 "de veceru DHCP, conséñelu equí"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1974,26 +2187,26 @@ msgstr ""
 "Dominios usaos al resolver nomes de host. Use comes pa xebrar múltiples "
 "dominios."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID del veceru D_HCP:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "Dominios de _gueta:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Sirvidores _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2002,12 +2215,12 @@ msgstr ""
 "de host. Use comes pa xebrar múltiples direiciones de sirvidores de nomes de "
 "dominiu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Requier direición IPv4 pa qu'esta conexón se complete"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2015,25 +2228,34 @@ msgstr ""
 "Al coneutase a redes capaces IPv6, permite a la conexón completar si la "
 "configuración IPv4 falla pero la configuración IPv6 tien éxitu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rutes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desactiváu"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2044,16 +2266,20 @@ msgstr ""
 "de host. Use comes pa xebrar múltiples direiciones de sirvidores de nomes de "
 "dominiu."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requier direición IPv6 pa qu'esta conexón se complete"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2061,752 +2287,853 @@ msgstr ""
 "Al coneutase a redes capaces IPv4, permite a la conexón completar si la "
 "configuración IPv6 falla pero la configuración IPv4 tien éxitu."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Métricu"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Importar"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Básica"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nú_mberu:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avanzaes"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID de R_ede:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Cambiar…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Permitir «roaming» si la rede doméstica nun ta disponible"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "A_mosar les contraseñes"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Identificación"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Métodos permitíos:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurar _métodos…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Usar cifráu puntu-a-puntu (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Requerir cifráu de 128-bits"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Usar _estaos MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permitir compresión de datos _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permitir compresión de datos _deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Usar compresión de ca_beceres TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Ecu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Unviar paquetes _echo PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Métodu:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Métodu:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avanzaes"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Redes cableaes"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Seguridá:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Seguridá:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Seguridá:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "C_lave privada:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Seguridá:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Co_nexón:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet automático"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Señes de Hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Señes de Hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Seguridá:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Potencia de la tresmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Potencia de la tresmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Direición MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Seguridá:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Potencia de la tresmisión:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Métodos d'identificación permitíos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2816,112 +3143,100 @@ msgstr ""
 "d'identificación. Si la conexón falla, intenta desactivar el soporte pa "
 "dellos métodos."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "El módulu complementariu VPN nun fue quien a importar afayadizamente la "
 "conexón vPN\n"
 "Fallu: nun hai dengún tipu de serviciu VPN."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Nun se ye quien a importar la conexón VPN"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"El ficheru « %s » nun se puede lleer o nun tien información de conexón VPN "
-"reconocibles\n"
-"\n"
-"Erreur : %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Desconocida"
-
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Esbilla'l ficheru pa importar"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Señes de Hardware:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Exportar conexón VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2929,79 +3244,86 @@ msgstr ""
 "El diálogu de l'editor de conexones nun pudo inicializase por un error "
 "desconocíu."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Nun pudo crease la nueva conexón"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Falló desaniciar conexón"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "¿De verdá quies quitar la conexón %s ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Conexones _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Direición"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Mázcara de rede"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Puerta d'enllaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Métricu"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefixu"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Editando la conexón ensin nome"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nome de la conexón:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Error al anicializar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Falló amestar conexón"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3009,258 +3331,301 @@ msgstr ""
 "L'editor de la conexón nun fue a atopar dellos ficheros de recursos (nun "
 "s'atopó'l ficheru .iu)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Guardar cualesquier cambéu fechu nesta conexón."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Autenticar pa guardar esta conexón pa tolos usuarios nesti equipu."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Nun pudo crease la nueva conexón"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Nun pudo editase la conexón"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Error al crear el diálogu de l'editor de conexón."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Error al anicializar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Falló amestar conexón"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nome de la conexón:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_sportar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "etiqueta"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "etiqueta"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fai %d minutu"
 msgstr[1] "fai %d minutos"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fai %d hora"
 msgstr[1] "fai %d hores"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fai %d día"
 msgstr[1] "fai %d díes"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fai %d mes"
 msgstr[1] "fai %d meses"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fai %d añu"
 msgstr[1] "fai %d años"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Falló amestar conexón"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Conexón cableada %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Conexón cableada %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Caberu emplegu"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Editar la conexón seleicionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentíquese pa editar la conexón seleicionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Desaniciar la conexón seleicionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentíquese pa desaniciar la conexón seleicionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Tipu de conexón de banda ancha móvil non sofitáu."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Desconozse cómo crear conexones «%s»"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Fallu al editar la conexón"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Fallu al crear la conexón"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Falló amestar conexón"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Desconozse cómo crear conexones «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Fallu al editar la conexón"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Nun s'alcontró una conexón con UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Conexones de rede"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Conexones _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguridá 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa seguridá Wi-Fi."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Emplegar la seguridá 802.1X pa esta conexón"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "nun pudo alcontrase'l preséu Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Activar _Rede"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Rede Wifi"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS primariu:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Conexón cableada %d"
@@ -3268,34 +3633,39 @@ msgstr "Conexón cableada %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu DSL"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu DSL"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interface:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexón DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3305,57 +3675,56 @@ msgstr ""
 "Esta opción bloquia esta conexón al preséu de rede especificáu pola so "
 "direición permanente MAC introducida equí. Por exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Inoráu"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Direición MAC _clonada:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexón cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Predetermináu"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3366,186 +3735,188 @@ msgstr ""
 "Esta opción bloquia esta conexón al preséu de rede especificáu pola so "
 "direición permanente MAC introducida equí. Por exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa Wi-Fi."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu IPv4"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automáticu (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Namái direiciones automátiques (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automáticu, namái direiciones"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automáticu (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Namái direiciones automátiques (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automáticu (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Namái direiciones automátiques (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Namái enllaz llocal"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "Sirvidores _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "Dominios de _gueta:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando los caminos IPv4 pa %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Axustes de IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automáticu, DHCP únicamente"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando les rutes IPv6 pa %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Axustes de IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Nun pudo cargase la interface d'usuariu pa IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Nun puede cargase l'interfaz d'usuariu DSL"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Conexón DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu pa banda ancha móvil."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tipu de conexón de banda ancha móvil non sofitáu."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Esbillar la triba de proveedor de banda ancha móvil"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3554,91 +3925,87 @@ msgstr ""
 "Esbillar la teunoloxía qu'usa el so proveedor de banda ancha móvil. Si nun "
 "ta xuru, entrúgue-y al so proveedor."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "El mio fornidor usa teunoloxía basada en _GSM (ex. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "El mio fornidor usa teunoloxía basada en C_DMA (ex. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nengún"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editando los métodos d'autenticación PPP pa %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Axustes de PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu pa PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Conexón cableada %d"
@@ -3646,11 +4013,11 @@ msgstr "Conexón cableada %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
@@ -3658,59 +4025,59 @@ msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Nun hai conexón de rede"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu IPv4"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Conexón VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Nun se puede cargar la interfaz d'usuariu de VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Nun pudo alcontrase'l serviciu plugin VPN pa '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Nun pudo alcontrase'l serviciu plugin VPN pa '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Falló amestar conexón"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Nun se puede cargar la interfaz d'usuariu de VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Nun pudo alcontrase'l serviciu plugin VPN pa '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexón VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Escoyer una triba de conexón VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3721,7 +4088,7 @@ msgstr ""
 "conexón VPN que quies crear nun apaez na llista, pue ser que nun tengas "
 "instaláu'l complementu de VPN correutu."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3730,7 +4097,7 @@ msgstr ""
 "Esta opción bloquia esta conexón al puntu d'accesu inalámbricu (AP) "
 "especificáu pol BSSID inxertáu equí. Por exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3740,100 +4107,98 @@ msgstr ""
 "Esta opción bloquia esta conexón al preséu de rede especificáu pola so "
 "direición permanente MAC introducida equí. Por exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Cualisquier preséu"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexón cableada %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Fras de pasu WEP de 128 bits"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nun pudo cargase l'interfaz d'usuariu pa seguridá Wi-Fi; falten los axustes "
 "Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Seguridá inalámbrica"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa seguridá Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Un ficheru denomáu « %s » yá existe."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Trocar"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "¿Quies trocar %s cola conexón VPN que tas guardando?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nun se pue esportar la conexón VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3844,222 +4209,106 @@ msgstr ""
 "\n"
 "Fallu : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Exportar conexón VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desbloquiar"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Información de la conexón"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Conexones de rede actives"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Certificáu C_A:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escueyi'l to certificáu personal..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "C_lave privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Contraseña de clave pri_vada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Escueyi'l to certificáu personal..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Certificáu del _usuariu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"La so conexón móvil de banda ancha ta configurada colos siguientes axustes:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "El to preséu:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "El to fornidor:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "El to plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Agora fadráse una conexón col so proveedor de banda ancha móvil usando los "
-"axustes qu'esbilló. Si la conexón falla, o nun puede acceder a los recursos "
-"de rede, compruebe de nuevu los sos axustes. Pa modificar los sos axustes de "
-"conexón de la banda ancha móvil, esbille «Conexones de rede» dende'l menú "
-"Sistema » Preferencies."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirmar los axustes de la banda ancha móvil"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "El mio país nun ta na llista"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Non llistáu"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Esbillar el so plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Plan _APN (nome del puntu d'accesu) esbilláu"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Avisu: Esbillar un plan incorreutu puede traer problemes na facturación de "
-"la cuenta de banda ancha móvil o impedir la conectividá.\n"
-"\n"
-"Si nun tu ta seguru del so plan de precios, entrugue al so proveedor."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Escoyer el so plan de precios"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "El mio plan nun ta na llista…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Esbillar el so proveedor d'una _llista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fornidor"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Proveedor:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "El mio proveedor usa teunoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "El mio proveedor usa teunoloxía CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Esbille'l so proveedor…"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Llista de país o rexón:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País o rexón"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "El mio país nun ta na llista"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Escueye'l país o rexón del to fornidor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Preséu GSM instaláu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Preséu CDMA instaláu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Cualisquier preséu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Conexón de banda ancha móvil nueva"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4067,191 +4316,270 @@ msgstr ""
 "Esti asistente ayúdate a configurar de forma cenciella una conexón de banda "
 "ancha móvil a una rede de teléfonu móvil (3G)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Necesitará la siguiente información:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "El nome del fornidor de banda ancha"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "El nome del to plan de precios"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(en dalgunos casos) El nome del plan de precios del to APN (nome del puntu "
 "d'accesu)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crear una conexón pa _esti preséu móvil de banda ancha:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Cualisquier preséu"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar una conexón de banda ancha móvil"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Conexón de banda ancha móvil nueva"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o rexón"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Escueye'l país o rexón del to fornidor"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Esbillar el so proveedor d'una _llista:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "El mio proveedor usa teunoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "El mio proveedor usa teunoloxía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Esbille'l so proveedor…"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Esbillar el so plan:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Plan _APN (nome del puntu d'accesu) esbilláu"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Avisu: Esbillar un plan incorreutu puede traer problemes na facturación de "
+"la cuenta de banda ancha móvil o impedir la conectividá.\n"
+"\n"
+"Si nun tu ta seguru del so plan de precios, entrugue al so proveedor."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Escoyer el so plan de precios"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La so conexón móvil de banda ancha ta configurada colos siguientes axustes:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "El to preséu:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "El to fornidor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "El to plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Agora fadráse una conexón col so proveedor de banda ancha móvil usando los "
+"axustes qu'esbilló. Si la conexón falla, o nun puede acceder a los recursos "
+"de rede, compruebe de nuevu los sos axustes. Pa modificar los sos axustes de "
+"conexón de la banda ancha móvil, esbille «Conexones de rede» dende'l menú "
+"Sistema » Preferencies."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmar los axustes de la banda ancha móvil"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(dengún)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificáu C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Desconocida"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Escueyi'l to certificáu personal..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Certificáu del _usuariu:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Fallu al editar la conexón"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Desbloquiar"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Entrugar esta contraseña cada vegada"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Necesítase una contraseña pa coneutar con «%s»"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Contraseña:"
+msgid "Sh_ow passwords"
+msgstr "A_mosar les contraseñes"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Contraseña:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "A_mosar les contraseñes"
+msgid "_Secondary Password:"
+msgstr "_Contraseña:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desconeutar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinámica (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4259,42 +4587,42 @@ msgstr ""
 "Necesítense les contraseñes o les claves d'encriptación pa l'accesu a la "
 "rede inalámbrica « %s »."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Requierse autentificación pa la rede inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Necesítase autentificación pa la rede inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Crear Nueva Rede Wifi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nueva rede inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Introduz un nome pa la rede wifi que quies crear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Coneutar a redes invisibles inalámbriques"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rede invisible inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4303,37 +4631,55 @@ msgstr ""
 "Escueyi'l nome y los detalles de seguridá de la rede invisibles inalámbrica "
 "a la que te quies coneutar."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Seguridá inalámbrica:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nexón:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "_Adaptador Wifi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Proveedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Llista de país o rexón:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País o rexón"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Cableada"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4343,17 +4689,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Seguridá inalámbrica:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nome de _rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexón:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador Wifi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Usu:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4361,7 +4731,7 @@ msgstr ""
 "Esti programa ye un componente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4369,420 +4739,467 @@ msgstr ""
 "Nun ta pensáu pa interaición a traviés de la llinia de comandos pero en so "
 "llugar execútase nel entornu d'escritoriu GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "Non habilitáu"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nun ta rexistráu"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "guetando"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "torgóse'l rexistru"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Necesítase un códigu PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Necesítase un códigu PIN pal preséu móvil de banda ancha"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "La conexón de banda ancha móvil «%s» ta activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Conexón DSL %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Certificáu C_A:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Identidá anóni_ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Identificación"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identidá anóni_ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Escueyi un certificáu d'una autoridá de certificación..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificáu C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Certificáu C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "Versión _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Fras de pasu WEP de 128 bits"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "A_mosar les contraseñes"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Certificáu C_A:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Certificáu C_A:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentidá:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Predetermináu)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema abiertu"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Contraseña compartida"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Predetermináu)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Clave:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "A_mosar la clave"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Índ_iz WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Triba:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (Predetermináu)"
+
+#~ msgid "Ignored"
+#~ msgstr "Inoráu"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Fallu al actualizar los secretos de conexón por un error desconocíu."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "I_nformación de la Conexón"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Nun se ye quien a importar la conexón VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "El ficheru « %s » nun se puede lleer o nun tien información de conexón "
+#~ "VPN reconocibles\n"
+#~ "\n"
+#~ "Erreur : %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Desconocida"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Escueyi un certificáu d'una autoridá de certificación..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Certificáu C_A:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Xestor de la rede"
 
@@ -4818,15 +5235,6 @@ msgstr "_Triba:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegociar"
 
@@ -4930,12 +5338,6 @@ msgstr "_Triba:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundariu:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciariu:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Activar la banda ancha móvil WiMA_X"
 
@@ -4991,12 +5393,6 @@ msgstr "_Triba:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Disponible pa tolos usuarios"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Coneutar _automáticamente"
-
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
 #~ msgid "Error saving connection"
 #~ msgstr "Fallu al guardar la conexón"
 
@@ -5031,9 +5427,6 @@ msgstr "_Triba:"
 #~ msgid "Error: %s"
 #~ msgstr "Fallu: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Fallu al crear la conexón DUN: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "Encaboxóse l'asistente móvil"
 
diff --git a/po/be.po b/po/be.po
index 9c4f239c..0cf2e6d0 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-08-19 00:28+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
@@ -17,226 +18,249 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Сетка"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Кіраванне сеткавымі злучэннямі"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Сеткавыя злучэнні"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Дзейныя сеткавыя злучэнні"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Настройкі сеткавага злучэння"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Выключыць апавяшчэнні аб злучэнні"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Выключыць апавяшчэнні пры злучэнні з сеткай."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Выключыць апавяшчэнні аб адлучэнні"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Выключыць апавяшчэнні пры адлучэнні ад сеткі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Выключыць апавяшчэнні аб VPN-злучэнні"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "Выключыць апавяшчэнні пры злучэнні і адлучэнні ад VPN-сеткі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Блакіраваць апавяшчэнні аб наяўнасці сетак"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "Выключыць апавяшчэнні аб наяўнасці сетак Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Адбітак"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Выкарыстоўваецца для вызначэння патрэбы ў міграцыі настроек на новую версію."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Выключыць магчымасць стварэння Wi-Fi-сеткі"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "Выключыць для аплета магчымасць стварэння adhoc-сеткі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "Выключыць папярэджанні аб сертыфікатах CA для EAP-ідэнтыфікацыі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 "Выключыць папярэджанні аб сертыфікатах CA у другой фазе EAP-ідэнтыфікацыі."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Аплет NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Няма сеткавага злучэння"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Аплет NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Ідэнтыфікацыя 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Да_лучыцца"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Назва сеткі:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Не ўдалося дадаць/уключыць злучэнне"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Няўдалае злучэнне"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Не ўдалося адлучыць прыстасаванне"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Няўдалае адлучэнне"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Не ўдалося ўключыць злучэнне"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Больш не паказваць гэта паведамленне"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -246,7 +270,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" разарвана з прычыны яго перапынення."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -256,7 +280,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны яго перапынення."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны нечаканага спынення VPN-службы."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -276,7 +300,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе, бо VPN-служба вярнула хібную канфігурацыю "
 "настроек."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -286,7 +310,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе, бо дасягнута максімальная колькасць спроб "
 "злучэння."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +319,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе, бо VPN-служба не запусцілася да часу."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -304,7 +328,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны няўдалася запуску VPN-службы."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе з прычыны адсутнасці прыдатных сакрэтных "
 "ключоў."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе праз хібныя сакрэтныя ключы."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -343,19 +367,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Злучэнне VPN паспяхова ўсталявана.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Паведамленне VPN-уваходу"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Няўдалае VPN-злучэнне"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -368,7 +392,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -381,569 +405,594 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "прыстасаванне не гатова (няма апаратнага апраграмавання)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "прыстасаванне не гатова"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "няма злучэння"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Адлучыцца"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "прыстасаваннем нельга кіраваць"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Няма сеткавых прыстасаванняў"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN-з_лучэнні"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Настройка VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN-з_лучэнні"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager не запушчаны..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Сеткавыя паслугі выключаны"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Уключыць сеткавыя паслугі"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Уключыць Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Уключыць _шырокапалосную мабільную сувязь"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Уключыць _апавяшчэнні"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Інфармацыя аб _злучэнні"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Настройка злучэнняў..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Аб праграме"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Вы злучаны з \"%s\"."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Адлучана"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Сеткавае злучэнне разарвана."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Падрыхтоўка сеткавага злучэння \"%s\"..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 "Для сеткавага злучэння \"%s\" патрабуецца ідэнтыфікацыя карыстальніка..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Запыт сеткавага адрасу для \"%s\"..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Сеткавае злучэнне \"%s\" уключана"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Запуск VPN-злучэння \"%s\"..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Для VPN-злучэння \"%s\" патрабуецца ідэнтыфікацыя карыстальніка..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Запыт сеткавага адрасу для VPN-злучэння \"%s\"..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-злучэнне \"%s\" уключана"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Няма сеткавага злучэння"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Аплет NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Хібны PUK-код. Звярніцеся да правайдара паслуг."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Хібны PIN-код. Звярніцеся да правайдара паслуг."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Пасылка коду разблакіравання..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Шырокапалоснае мабільнае злучэнне (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Шырокапалоснае мабільнае злучэнне"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Даступна"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Новае шырокапалоснае мабільнае злучэнне"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Злучэнне ўсталявана"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Вы злучаны з шырокапалоснай мабільнай сеткай."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Шырокапалосная мабільная сетка."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Вы зарэгістраваны ў дамашняй сетцы."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Вы зарэгістраваны ў роўмінг-сетцы."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Вы злучаны з шырокапалоснай мабільнай сеткай."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Падрыхтоўка шырокапалоснага мабільнага злучэння \"%s\"..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Настройка шырокапалоснага мабільнага злучэння \"%s\"..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Для шырокапалоснага мабільнага злучэння \"%s\" патрабуецца ідэнтыфікацыя "
 "карыстальніка..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Шырокапалоснае мабільнае злучэнне \"%s\" уключана"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Аўта Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Сеткі Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Сетка Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Сеткі Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Сетка Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Вы злучаны з сеткай Ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Падрыхтоўка сеткавага злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Настройка сеткавага злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Для сеткавага злучэння Ethernet \"%s\" патрабуецца ідэнтыфікацыя "
 "карыстальніка..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Запыт сеткавага адрасу для злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Сеткавае злучэнне Ethernet \"%s\" уключана"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-ідэнтыфікацыя"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Злучэнне са схаванай сеткай Wi-Fi"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Стварэнне новай сеткі Wi-Fi"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(няма)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Не ўдалося дадаць новае злучэнне"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сеткі Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сетка Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Сетка Wi-Fi"
 msgstr[1] "Сеткі Wi-Fi"
 msgstr[2] "Сеткі Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключаны"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi выключаны з дапамогай апаратнага пераключальніка"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Больш сетак"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Даступныя сеткі Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Выкарыстайце меню са спісам сетак, каб злучыцца з сеткай Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Вы злучаны з сеткай Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Падрыхтоўка сеткавага злучэння Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Настройка сеткавага злучэння Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Для сеткавага злучэння Wi-Fi \"%s\" патрабуецца ідэнтыфікацыя "
 "карыстальніка..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Запыт сеткавага адрасу для сеткі Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Сеткавае злучэнне Wi-Fi \"%s\" уключана: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Сеткавае злучэнне Wi-Fi \"%s\" уключана"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Не ўдалося ўключыць злучэнне"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Памылка паказу інфармацыі аб злучэнні:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Дынамічны WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Адрасы"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Няма"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (прадвызначана)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мбіт/с"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Невядома"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Невядома"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-адрас"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Адрас шырокай трансляцыі"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Невядома"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Маска падсеткі"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Першы DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Другі DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Трэці DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Агульнае"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Апаратны адрас"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Хуткасць"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Бяспека:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Прадвызначаны маршрут"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ігнаравана"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Пароль:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Тып VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Сеткавая брама VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Карыстальнік VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Банер VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Асноўнае злучэнне"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Невядома"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Дзейных злучэнняў не знойдзена!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -951,18 +1000,22 @@ msgstr ""
 "Аўтарскія правы © 2005-2008 Novell, Inc.\n"
 "ды іншыя ўдзельнікі праекта"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет абшару апавяшчэння для кіравання сеткавымі прыстасаваннямі і "
 "злучэннямі."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Сеціўная пляцоўка NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -970,33 +1023,33 @@ msgstr ""
 "Аплет NetworkManager не здолеў адшукаць некаторыя патрэбныя рэсурсы (.ui-"
 "файл не знойдзены)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Адсутныя рэсурсныя файлы"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Пароль да шырокапалоснай мабільнай сеткі"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Для злучэння з сеткай \"%s\" патрэбны пароль."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Патрэбны код разблакіравання PIN-коду"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Патрэбны код разблакіравання PIN-коду"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1006,25 +1059,25 @@ msgstr ""
 "патрэбны код разблакіравання PIN-коду."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Паказаць PIN-код"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Патрэбны код разблакіравання PUK-коду"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Патрэбны код разблакіравання PUK-коду"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1034,35 +1087,42 @@ msgstr ""
 "патрэбны код разблакіравання PUK-коду."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Новы PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Паўторна ўпішыце новы PIN-код:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Паказаць 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Інфармацыя аб злучэнні"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Не ўдалося стварыць DUN-злучэнне: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1071,56 +1131,56 @@ msgstr ""
 "IP-адрасы вызначаюць ваш камп'ютар у сетцы. Пстрыкніце ў кнопку \"Дадаць\", "
 "каб дадаць IP-адрас."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Выдаліць"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "І_гнараваць аўтаматычна атрыманыя маршруты"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Выкарыстоўваць злучэнне толькі для рэсурсаў гэтай сеткі"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Калі ўключана, гэтае злучэнне ніколі не будзе прадвызначаным."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Стварыць..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Выберыце тып злучэння"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1132,85 +1192,100 @@ msgstr ""
 "Калі вы ствараеце VPN-злучэнне, а патрэбнага тыпу VPN няма ў спісе, гэта "
 "значыць, што ў сістэме не ўсталяваны адпаведны VPN-плугін."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Па_слуга:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Шырокая трансляцыя"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Адаптыўнае балансаванне перадачы даных"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Адаптыўнае балансаванне нагрузкі"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (рэкамендавана)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Звязаныя злучэнні:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Рэжым:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Частата назіранняў:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "мс"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Назва інтэрфейсу:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Назіранне за фізічным злучэннем:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP-_мэты:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1218,124 +1293,183 @@ msgstr ""
 "IP-адрас або спіс такіх адрасоў, падзеленых коскамі, для праверкі стану "
 "фізічнага злучэння."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "_Затрымка для вызначэння ўсталявання злучэння:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "З_атрымка для вызначэння знікнення злучэння:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Першы DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байтаў"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Кошт маршруту:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "_Злучэнні моста:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "За_трымка перасылкі:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Час прывітання:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Уключыць сеткавыя паслугі"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_Уключыць STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Максімальны час існавання:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Час старэння:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "аўтаматычна"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "прадвызначана"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "_Уключыць Wi-Fi"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1346,442 +1480,536 @@ msgstr ""
 "гэтага злучэння. Гэтую магчымасць яшчэ называюць кланіраваннем ці спуфінгам "
 "MAC-адрасу. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Адрас"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Адрас"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Назва VLAN-інтэрфейсу:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Апаратны адрас:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Любое прыстасаванне"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"З прычыны невядомай памылкі не ўдалося абнавіць сакрэтныя ключы злучэння."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Ужыць _802.1X для бяспекі гэтага злучэння"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "_Уключыць Wi-Fi"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_Прыярытэт:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Карыстальнік:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "Па_слуга:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Паказаць пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "П_ароль:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Інтэрфейс"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Бацькоўскі інтэрфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Бацькоўскі інтэрфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Вітая пара (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Мбіт/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Мбіт/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Гбіт/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Гбіт/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ігнараваць"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ручныя настройкі"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Порт:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "Па_слуга:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Кланіраваны MAC-адрас:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Пароль прыватнага ключа:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Прадвызначана"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ігнараваць"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Шырокая трансляцыя"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Пароль прыватнага ключа:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Хуткасць:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "_Поўнадуплекснае злучэнне"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "_Аўтаматычна злучацца з VPN для гэтага злучэння"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Няма"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Усе _карыстальнікі могуць злучацца з гэтай сеткай"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Аўтаматычна злучацца з гэтай сеткай пры яе наяўнасці"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "_Аўтаматычна злучацца з VPN для гэтага злучэння"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Інфармацыя аб _злучэнні"
+msgid "Firewall _zone"
+msgstr "Зона _брандмаўэра:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Звязаныя злучэнні:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "І_гнараваць аўтаматычна атрыманыя маршруты"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "Зона _брандмаўэра:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1790,7 +2018,7 @@ msgstr ""
 "IP-адрасы вызначаюць ваш камп'ютар у сетцы. Пстрыкніце ў кнопку \"Дадаць\", "
 "каб дадаць IP-адрас."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1798,128 +2026,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Аўтаматычна, толькі адрасы"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адрасы"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Транспартны рэжым:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Дэйтаграмы"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Транспартны рэжым:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Назва прыстасавання + нумар"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Рэжым:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Аўтаматычныя настройкі з уласным DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Лакальнае злучэнне"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Даступна для іншых камп'ютараў"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Метад:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1930,8 +2162,8 @@ msgstr ""
 "дадатковыя настройкі для вашага камп'ютара. Калі вы хочаце выкарыстоўваць "
 "такі ідэнтыфікатар, упішыце яго тут."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1939,25 +2171,26 @@ msgstr ""
 "Дамены для вызначэння адрасоў хостаў. Можна падаць некалькі даменаў, "
 "падзяліўшы іх коскамі."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP-ідэнтыфікатар _кліента:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Дамены пошуку:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS-_серверы:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1965,35 +2198,45 @@ msgstr ""
 "IP-адрасы сервераў даменных назваў для вызначэння адрасоў хостаў. Можна "
 "падаць некалькі сервераў, падзяліўшы іх назвы коскамі."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Вымагаць настройкі IPv_4-сеткі для паспяховага злучэння"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr "Пры злучэнні з IPv6-сеткай дазволіць злучэнне без IPv4-адрасоў."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "М_аршруты..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Выключана"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "_Уключыць Wi-Fi"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2003,770 +2246,879 @@ msgstr ""
 "IP-адрасы сервераў даменных назваў для вызначэння адрасоў хостаў. Можна "
 "падаць некалькі сервераў, падзяліўшы іх назвы коскамі."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Вымагаць настройкі IPv_6-сеткі для паспяховага злучэння"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr "Пры злучэнні з IPv4-сеткай дазволіць злучэнне без IPv6-адрасоў."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Метрыка"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Просты"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Нумар:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Адмысловае"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "Пункт д_оступу (APN):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Ідэнтыфікатар _сеткі:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Змяніць..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "PIN-к_од:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 "Дазволіць _карыстанне роўмінг-паслугамі пры недаступнасці дамашняй сеткі"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Паказаць паролі"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Ідэнтыфікацыя"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Дазволеныя метады:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Настройка _метадаў..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Сцісканне"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Шыфраваць PPP-злучэнне (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Патрабаваць 128-бітнага шыфравання"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_Ужыць stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_Дазволіць BSD-сцісканне даных"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Даз_воліць Deflate-сцісканне даных"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Сціскаць TCP-_загалоўкі"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Рэха"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Пасылаць р_эхавыя PPP-пакеты"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Метад:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Няма"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Метад:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Адмысловае"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Сеткі Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Прыярытэт:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Прыватны _ключ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "_Затрымка для вызначэння ўсталявання злучэння:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "З_атрымка для вызначэння знікнення злучэння:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP-_мэты:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP-_мэты:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "_Звязаныя злучэнні:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Апаратны адрас:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Апаратны адрас:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Прыярытэт:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Магутнасць перадачы:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Магутнасць перадачы:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Бацькоўскі інтэрфейс:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Назва VLAN-інтэрфейсу:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Кланіраваны MAC-адрас:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN-ід_энтыфікатар:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Назва прыстасавання + нумар"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + нумар"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Бяспека:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Магутнасць перадачы:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Мбіт/с"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Частата:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Паласа:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Дазволеныя метады ідэнтыфікацыі"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2776,111 +3128,99 @@ msgstr ""
 "ідэнтыфікацыі. Калі ж узнікаюць памылкі злучэння, паспрабуйце выключыць "
 "некаторыя з метадаў."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN-плугін не здолеў карэктна імпартаваць VPN-злучэнне.\n"
-"\n"
-"Памылка: тып VPN-службы не вызначаны."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Не ўдалося імпартаваць VPN-злучэнне"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Немагчымы прачытаць файл \"%s\", або ён не змяшчае апазнанай інфармацыі аб "
-"VPN-злучэнні\n"
+"VPN-плугін не здолеў карэктна імпартаваць VPN-злучэнне.\n"
 "\n"
-"Памылка: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Невядомая памылка"
+"Памылка: тып VPN-службы не вызначаны."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Выберыце файл для імпартавання"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Апаратнае"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Віртуальнае"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2888,79 +3228,86 @@ msgstr ""
 "Не ўдалося ініцыяваць дыялогавае акенца рэдактара злучэнняў з прычыны "
 "невядомай памылкі."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не ўдалося стварыць новае злучэнне"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Не ўдалося выдаліць злучэнне"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ці вы сапраўды хочаце выдаліць злучэнне \"%s\"?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN-з_лучэнні"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адрас"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Сеткавая маска"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Сеткавая брама"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрыка"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Прэфікс"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Змяненне %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Змяненне безназоўнага злучэння"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Назва злучэння:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Памылка ініцыяцыі рэдактара"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Не ўдалося дадаць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2968,103 +3315,101 @@ msgstr ""
 "Рэдактар злучэнняў не здолеў адшукаць некаторыя патрэбныя рэсурсы (.ui-файл "
 "не знойдзены)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Захаваць"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Захаваць усе змены, зробленыя для гэтага злучэння."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Ідэнтыфікуйце сябе, каб захаваць гэта злучэнне для ўсіх карыстальнікаў "
 "камп'ютара."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Не ўдалося стварыць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не ўдалося змяніць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Невядомая памылка стварэння дыялогавага акенца для рэдактара злучэння."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Памылка ініцыяцыі рэдактара"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Не ўдалося дадаць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "Выключыць папярэджанні аб сертыфікатах CA для EAP-ідэнтыфікацыі."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Назва злучэння:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Экспартаваць..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ніколі"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "зараз"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3072,7 +3417,7 @@ msgstr[0] "%d хвіліна таму"
 msgstr[1] "%d хвіліны таму"
 msgstr[2] "%d хвілін таму"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3080,7 +3425,7 @@ msgstr[0] "%d гадзіна таму"
 msgstr[1] "%d гадзіны таму"
 msgstr[2] "%d гадзін таму"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3088,7 +3433,7 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3096,7 +3441,7 @@ msgstr[0] "%d месяц таму"
 msgstr[1] "%d месяцы таму"
 msgstr[2] "%d месяцаў таму"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3104,126 +3449,171 @@ msgstr[0] "%d год таму"
 msgstr[1] "%d гады таму"
 msgstr[2] "%d гадоў таму"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Не ўдалося дадаць злучэнне"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL злучэнне %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL злучэнне %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Дата апошняга выкарыстання"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Змяніць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Ідэнтыфікуйце сябе, каб змагчы змяняць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Выдаліць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Ідэнтыфікуйце сябе,, каб змагчы выдаліць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Гэты тып шырокапалоснага мабільнага злучэння не падтрымліваецца."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Невядома, як ствараць злучэнні \"%s\""
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Памылка змянення злучэння"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Памылка стварэння злучэння"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Не ўдалося дадаць злучэнне"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Невядома, як ствараць злучэнні \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Памылка змянення злучэння"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Злучэнне з UUID \"%s\" не знойдзена"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Сеткавыя злучэнні"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN-з_лучэнні"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-бяспека"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Ужыць _802.1X для бяспекі гэтага злучэння"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек Ethernet."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bond-злучэнне %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Сетка Ethernet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Сетка Wi-Fi"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для bond-злучэнняў."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Першы DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond-злучэнне %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для злучэнняў-мастоў."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Злучэнне-мост %d"
@@ -3231,35 +3621,40 @@ msgstr "Злучэнне-мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для порта злучэння-моста."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Бацькоўскі інтэрфейс:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL злучэнне %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3269,45 +3664,44 @@ msgstr ""
 "Гэтай опцыяй можна прывязаць злучэнне да пэўнага сеткавага прыстасавання, "
 "вызначанага яго MAC-адрасам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ігнаравана"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Кланіраваны MAC-адрас:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Злучэнне Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3317,11 +3711,11 @@ msgstr ""
 "зона, а азначае, што будзе ўжыта прадвызначаная зона брандмаўэра. Настройка "
 "будзе карыснай, толькі калі ўключаны firewalld."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Не ўдалося загрузіць асноўны інтэрфейс карыстальніка."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3332,190 +3726,195 @@ msgstr ""
 "Гэтай опцыяй можна прывязаць злучэнне да пэўнага сеткавага прыстасавання, "
 "вызначанага яго MAC-адрасам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек "
 "InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Злучэнне InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення IPv4-настроек."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Злучэнне Ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Аўтаматычна (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Аўтаматычна, толькі адрасы"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Аўтаматычна (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Аўтаматычна (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Толькі лакальнае злучэнне"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Д_адатковыя DNS-серверы:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "_Дадатковыя домены пошуку:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Змяненне IPv4-маршрутаў для %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-настройкі"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення IPv4-настроек."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Аўтаматычна, толькі DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Змяненне IPv6-маршрутаў для %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-настройкі"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення IPv6-настроек."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr ""
+"Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Злучэнне WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "Падпарадкаванае злучэнне %2$d (%1$s)"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек "
 "шырокапалоснага мабільнага злучэння."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Гэты тып шырокапалоснага мабільнага злучэння не падтрымліваецца."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Выберыце тып правайдара шырокапалоснага мабільнага злучэння"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3524,7 +3923,7 @@ msgstr ""
 "Вызначыце тэхналогію, якой карыстаецца ваш мабільны аператар. Калі вы не "
 "ўпэўнены, спытайце ў яго прадстаўнікоў."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Мой аператар выкарыстоўвае GSM-_тэхналогію (напрыклад, GPRS, EDGE, UMTS, "
@@ -3532,86 +3931,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мой аператар выкарыстоўвае CDMA-т_эхналогію (напрыклад, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "нічога"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Змяненне метадаў PPP-ідэнтыфікацыі для %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Настройкі PPP-злучэння"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек PPP-"
 "злучэння."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для bond-злучэнняў."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для VLAN."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL злучэнне %d"
@@ -3619,12 +4014,12 @@ msgstr "DSL злучэнне %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для порта злучэння-моста."
@@ -3632,60 +4027,60 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Няма сеткавага злучэння"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для VLAN."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-злучэнне %d"
 
-#: ../src/connection-editor/page-vpn.c:98
+#: src/connection-editor/page-vpn.c:64
+#, fuzzy, c-format
+msgid "Could not load editor VPN plugin for “%s” (%s)."
+msgstr "Не ўдалося адшукаць службу VPN-плугіна для \"%s\"."
+
+#: src/connection-editor/page-vpn.c:65
+#, fuzzy
+msgid "unknown failure"
+msgstr "Няўдалае злучэнне"
+
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек VPN-"
 "злучэння."
 
-#: ../src/connection-editor/page-vpn.c:113
+#: src/connection-editor/page-vpn.c:117
 #, fuzzy, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Не ўдалося адшукаць службу VPN-плугіна для \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:122
-#, fuzzy, c-format
-msgid "Could not load editor VPN plugin for “%s” (%s)."
-msgstr "Не ўдалося адшукаць службу VPN-плугіна для \"%s\"."
-
-#: ../src/connection-editor/page-vpn.c:123
-#, fuzzy
-msgid "unknown failure"
-msgstr "Няўдалае злучэнне"
-
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN злучэнне %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Выберыце тып VPN-злучэння"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3695,7 +4090,7 @@ msgstr ""
 "Вызначыце тып новага VPN-злучэння. Калі патрэбнага тыпу няма ў спісе, гэта "
 "значыць, што ў сістэме не ўсталяваны адпаведны VPN-плугін."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3704,7 +4099,7 @@ msgstr ""
 "Гэтай опцыяй можна прывязаць злучэнне да пэўнага пункту доступу Wi-Fi, "
 "вызначанага яго BSSID-ідэнтыфікатарам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3714,100 +4109,98 @@ msgstr ""
 "Гэтай опцыяй можна прывязаць злучэнне да пэўнага сеткавага прыстасавання, "
 "вызначанага яго MAC-адрасам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Любое прыстасаванне"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Злучэнне Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP, 40/128-бітны ключ (Hex ці ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP, 128-бітны пароль"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Дынамічны WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "Wi-Fi. Адсутнічае настройка Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Бяспека Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Файл з назвай \"%s\" ужо існуе."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Ці вы хочаце замяніць %s на новае VPN-злучэнне, якое вы зараз захоўваеце?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не ўдалося экспартаваць VPN-злучэнне"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3818,223 +4211,106 @@ msgstr ""
 "\n"
 "Памылка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Экспартаваць VPN-злучэнне..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Разблакіраваць"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Аўтаматычна разблакіраваць гэта прыстасаванне"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Інфармацыя аб злучэнні"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Дзейныя сеткавыя злучэнні"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Вызначэнне сертыфіката CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Прыватны _ключ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Пароль прыватнага ключа:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Вызначэнне сертыфіката CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Сертыфікат карыстальніка:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Ваша шырокапалоснае мабільнае злучэнне мае наступную канфігурацыю настроек:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Прыстасаванне:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Мабільны аператар:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Тарыфны план:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Зараз будзе ўсталявана злучэнне з вашым мабільным аператарам з вызначанымі "
-"вамі настройкамі. Калі злучэнне не будзе ўсталявана або вы не атрымаеце "
-"доступ да сеткавых рэсурсаў, пераправерце настройкі. Каб змяніць настройкі "
-"шырокапалоснага мабільнага злучэння, выберыце пункт \"Сеткавыя злучэнні\" ў "
-"меню \"Асабістыя настройкі\"."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Маёй краіны няма ў спісе"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не ў спісе"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Вызначыце тарыфны план:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_Пункт доступу тарыфнага плана (APN):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Увага: выбар няправільнага тарыфнага плана можа мець вынікам празмерныя "
-"фінансавыя страты або перашкодзіць злучэнню.\n"
-"\n"
-"Калі вы не ўпэўнены, якім тарыфным планам вы карыстаецеся, спытайце ў свайго "
-"мабільнага аператара аб патрэбным пункце доступу (APN)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Выбар тарыфнага плана"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мой тарыфны план адсутнічае ў спісе..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Выберыце свайго мабільнага _аператара са спіса:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Аператар"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Аператар:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Мой аператар выкарыстоўвае GSM-тэхналогію (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Мой аператар выкарыстоўвае CDMA-тэхналогію (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Выбар мабільнага аператара"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Спіс краін і рэгіёнаў:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Краіна ці рэгіён"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Маёй краіны няма ў спісе"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Выбар краіны ці рэгіёна мабільнага аператара"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Усталяванае GSM-прыстасаванне"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Усталяванае CDMA-прыстасаванне"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Любое прыстасаванне"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Новае шырокапалоснае мабільнае злучэнне"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4042,224 +4318,304 @@ msgstr ""
 "Гэты памочнік дапаможа вам лёгка настроіць шырокапалоснае мабільнае злучэнне "
 "з сотавай 3G-сеткай."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Вам спатрэбіцца наступная інфармацыя:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Назва вашага мабільнага аператара"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Назва вашага тарыфнага плана"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(у некаторых выпадках) Пункт доступу (APN) для вашага тарыфнага плана"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 "Стварыць злучэнне для _гэтага прыстасавання шырокапалоснай мабільнай сувязі:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Любое прыстасаванне"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройка шырокапалоснага мабільнага злучэння"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Новае шырокапалоснае мабільнае злучэнне"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Краіна ці рэгіён"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Выбар краіны ці рэгіёна мабільнага аператара"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Выберыце свайго мабільнага _аператара са спіса:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мой аператар выкарыстоўвае GSM-тэхналогію (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мой аператар выкарыстоўвае CDMA-тэхналогію (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Выбар мабільнага аператара"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Вызначыце тарыфны план:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_Пункт доступу тарыфнага плана (APN):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Увага: выбар няправільнага тарыфнага плана можа мець вынікам празмерныя "
+"фінансавыя страты або перашкодзіць злучэнню.\n"
+"\n"
+"Калі вы не ўпэўнены, якім тарыфным планам вы карыстаецеся, спытайце ў свайго "
+"мабільнага аператара аб патрэбным пункце доступу (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Выбар тарыфнага плана"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Ваша шырокапалоснае мабільнае злучэнне мае наступную канфігурацыю настроек:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Прыстасаванне:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Мабільны аператар:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Тарыфны план:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Зараз будзе ўсталявана злучэнне з вашым мабільным аператарам з вызначанымі "
+"вамі настройкамі. Калі злучэнне не будзе ўсталявана або вы не атрымаеце "
+"доступ да сеткавых рэсурсаў, пераправерце настройкі. Каб змяніць настройкі "
+"шырокапалоснага мабільнага злучэння, выберыце пункт \"Сеткавыя злучэнні\" ў "
+"меню \"Асабістыя настройкі\"."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(няма)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "_Сертыфікат CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Невядома"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Вызначэнне сертыфіката CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Сертыфікат карыстальніка:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Памылка змянення злучэння"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Разблакіраваць"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Штораз запытваць гэты пароль"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Для злучэння з сеткай \"%s\" патрэбны пароль."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "П_ароль:"
+msgid "Sh_ow passwords"
+msgstr "_Паказаць паролі"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "П_ароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_Паказаць паролі"
+msgid "_Secondary Password:"
+msgstr "П_ароль:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "П_ароль:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Адлучыцца"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Няма"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Дынамічны WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Стварыць"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для доступу да сеткі Wi-Fi \"%s\" патрэбны пароль або ключ шыфравання."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Стварэнне новай сеткі Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Новая сетка Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Упішыце назву новай сеткі Wi-Fi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Злучэнне са схаванай сеткай Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Схаваная сетка Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4267,35 +4623,55 @@ msgstr ""
 "Упішыце назву і вызначыце настройкі бяспекі для схаванай сеткі Wi-Fi, з якой "
 "трэба злучыцца."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Бяспека Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Злучэнне:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Адаптар Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "_Я не знайшоў свайго аператара і хачу вызначыць яго самастойна:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Аператар:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Спіс краін і рэгіёнаў:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Краіна ці рэгіён"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Правадны"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4305,17 +4681,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Бяспека Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Назва сеткі:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Злучэнне:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Адаптар Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Правілы карыстання:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4323,7 +4721,7 @@ msgstr ""
 "Гэта праграма з'яўляецца складовай часткай NetworkManager (https://wiki."
 "gnome.org/Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4331,416 +4729,473 @@ msgstr ""
 "Яна не прызначана для запуску з загаднага радка, а выконваецца ў працоўным "
 "асяроддзі GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "выключана"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "няма рэгістрацыі"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Асноўная сетка (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Асноўная сетка"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "пошук"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "адмоўлена ў рэгістрацыі"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s-роўмінг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роўмінг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роўмінг-сетка (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Роўмінг-сетка"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-код для SIM-карты \"%s\" у \"%s\""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Патрэбны PIN-код"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 "Для выкарыстання прыстасавання шырокапалоснага мабільнага інтэрнэту патрэбны "
 "PIN-код"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Шырокапалоснае мабільнае злучэнне \"%s\" уключана: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роўмінг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Злучэнне %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER- ці PEM-сертыфікаты (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM- ці PKCS#12-прыватныя ключы (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ігнараваць сертыфікат CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Выберыце PAC-файл..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-файлы (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Ананімна"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Ідэнтыфікавана"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Абодва"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Ананімная ідэнтычнасць:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC-ф_айл:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Унутраная ідэнтыфікацыя:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дазволіць _аўтаматычнае забеспячэнне PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Выберыце сертыфікат CA..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Версія 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Версія 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "_Сертыфікат CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Версія PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP, 128-бітны пароль"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Паказаць паролі"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ігнараваць сертыфікат CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "Ід_энтычнасць:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Тунэльны TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Абаронены EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Ід_энтыфікацыя:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (прадвызначана)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Адкрытая сістэма"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Супольны ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (прадвызначана)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ключ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Паказаць ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP-і_ндэкс:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Тып:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (прадвызначана)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ігнаравана"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "З прычыны невядомай памылкі не ўдалося абнавіць сакрэтныя ключы злучэння."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Прыярытэт:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Аўтаматычна злучацца з гэтай сеткай пры яе наяўнасці"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Інфармацыя аб _злучэнні"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Не ўдалося імпартаваць VPN-злучэнне"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Немагчымы прачытаць файл \"%s\", або ён не змяшчае апазнанай інфармацыі "
+#~ "аб VPN-злучэнні\n"
+#~ "\n"
+#~ "Памылка: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Невядомая памылка"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Выберыце сертыфікат CA..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "_Сертыфікат CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Аплет NetworkManager"
@@ -4774,15 +5229,6 @@ msgstr "_Тып:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "_Аўтаматычнае дамаўленне"
 
@@ -4878,12 +5324,6 @@ msgstr "_Тып:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Другі DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Трэці DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "MAC-адрас _прыстасавання:"
 
@@ -4935,13 +5375,6 @@ msgstr "_Тып:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Толькі аўтаматычна атрыманыя адрасы (PPP)"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr ""
-#~ "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Злучэнне WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4964,9 +5397,6 @@ msgstr "_Тып:"
 #~ msgid "Error: %s"
 #~ msgstr "Памылка: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Не ўдалося стварыць DUN-злучэнне: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Цяпер вы можаце карыстацца сваім тэлефонам."
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 38f4d75d..acf6e332 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2009-02-14 12:38+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -18,235 +19,256 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "Sietka:"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "Kiruj sietkavymi spałučeńniami"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Sietkavyja spałučeńni"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "_Ručnaja kanfihuracyja"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Kiruj i źmianiaj nałady sietkavych spałučeńniaŭ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 #, fuzzy
 msgid "Suppress networks available notifications"
 msgstr "Jość biazdrotavyja sietki"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Abiary sertyfikat CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Sietkavy kiraŭnik"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "- Ułaścivaści VPN dla NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Aŭtaryzacyja dla dracianoj sietki 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Spałučy"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "_Nazva sietki:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "Nieviadoma"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "adłučana"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Adłučany"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Bolš nie pakazvaj hetaje paviedamleńnie"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -256,7 +278,7 @@ msgstr ""
 "\n"
 "Spałučeńnie VPN \"%s\" vyklučyłasia, bo sietka była abarvanaja."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -266,7 +288,7 @@ msgstr ""
 "\n"
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo sietka była pierarvanaja."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -276,7 +298,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo pasłuha VPN niečakana "
 "pierapyniła rabotu."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +309,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo pasłuha VPN viarnuła "
 "nieprydatnuju kanfihuracyju."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +319,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo skončyŭsia termin tryvańnia "
 "spałučeńnia."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +329,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo pasłuha VPN nie ŭklučyłasia "
 "ŭ čas."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +339,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo nie ŭdałosia ŭklučyć pasłuhu "
 "VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -327,7 +349,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo nie staje prydatnych "
 "sakretaŭ VPN."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -337,7 +359,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN „%s”, bo padadzienyja niapravilnyja "
 "sakrety VPN."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -346,7 +368,7 @@ msgstr ""
 "\n"
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\"."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -354,19 +376,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Paviedamleńnie aŭtaryzacyi VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -379,7 +401,7 @@ msgstr ""
 "VPN.\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,333 +413,344 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\".\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 #, fuzzy
 msgid "device not ready (firmware missing)"
 msgstr "pryłada nie padrychtavanaja"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "pryłada nie padrychtavanaja"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "adłučana"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Adłučy"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "pryłada nie absłuhoŭvajecca"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Niama sietkavych pryładaŭ"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Spałučeńni _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Kanfihuruj VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Spałučeńni _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager nie ŭruchomleny..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Sietkavyja pasłuhi vyklučanyja"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Uklučy _sietkavyja pasłuhi"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Uklučy _biazdrotavuju sietku"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 #, fuzzy
 msgid "Enable _Mobile Broadband"
 msgstr "Mabilny Broadband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Źviestki ab spałučeńni"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Redahuj spałučeńni..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Ab"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Ciapier ty spałučany z „%s”."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Adłučany"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Sietkavaje spałučeńnie adłučanaje."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Padrychtoŭka sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Dla sietkavaha spałučeńnia \"%s\" patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Zapyt sietkavaha adrasu dla \"%s\"..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Sietkavaje spałučeńnie \"%s\" dziejničaje"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Uruchomleńnie spałučeńnia VPN \"%s\"..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Dla spałučeńnia VPN „%s” patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Zapyt adrasu VPN dla spałučeńnia \"%s\"..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Spałučeńnie VPN \"%s\" dziejničaje"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobile Broadband (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mabilny Broadband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Spałučeńnie ŭstalavanaje"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Parol dla sietki „Mobile Broadband”"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 #, fuzzy
 msgid "You are now connected to the mobile broadband network."
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Padrychtoŭka spałučeńnia „Mobile Broadband” z „%s”..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Kanfihuravańnie spałučeńnia „Mobile Broadband” z „%s”..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Dla spałučeńnia „Mobile Broadband” z „%s” patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Spałučeńnie „Mobile Broadband” z „%s” dziejničaje"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Dracianyja sietki (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Dracianaja sietka (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Dracianyja sietki"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Dracianaja sietka"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Padrychtoŭka dracianoha sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Kanfihuravańnie dracianoha sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Dla dracianoha sietkavaha spałučeńnia \"%s\" patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Zapyt sietkavaha adrasu dla dracianoha spałučeńnia \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Dracianoje sietkavaje spałučeńnie \"%s\" dziejničaje"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Aŭtaryzacyja DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Stvary novuju biazdrotavuju sietku"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(niama)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Dadaj novaje spałučeńnie VPN"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Dracianyja sietki (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Dracianaja sietka (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
@@ -725,273 +758,290 @@ msgstr[0] "Dracianaja sietka"
 msgstr[1] "Dracianaja sietka"
 msgstr[2] "Dracianaja sietka"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "biazdrotavyja sietkavyja pasłuhi vyklučanyja"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "Dracianyja sietki"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Jość biazdrotavyja sietki"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Kab spałučycca ź biazdrotavaj sietkaj, klikni ŭ hetuju ikonu"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Ciapier ty spałučany ź biazdrotavaj sietkaj \"%s\"."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Padrychtoŭka sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Kanfihuravańnie dracianoha sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Dla biazdrotavaj sietki \"%s\" patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Zapyt sietkavaha adrasu dla \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Biazdrotavaje sietkavaje spałučeńnie \"%s\" dziejničaje: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Dracianoje sietkavaje spałučeńnie \"%s\" dziejničaje"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Pamyłka pakazu źviestak ab spałučeńni:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamičny WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adras _MAC:"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Niama"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "zmoŭčana"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 #, fuzzy
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nieviadoma"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 #, fuzzy
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nieviadoma"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adras IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Tranślacyjny adras"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 #, fuzzy
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nieviadoma"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Maska padsietki"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Pieršy DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Druhi DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Druhi DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfejs"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Aparatny adras"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drajver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Chutkaść"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Biaśpieka:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Zmoŭčany šlach"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
 #, fuzzy
-msgid "Ignored"
-msgstr "Ihnaruj"
+msgid "Password"
+msgstr "Parol:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "Typ:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "Sietkavaja brama"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "Karystalnik:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Spałučeńnie:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nieviadoma"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Aŭtarskija pravy © 2004-2008 Red Hat, Inc.\n"
 "Aŭtarskija pravy © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet abšaru nahadvańniaŭ dla kiravańnia sietkavymi pryładami j "
 "spałučeńniami."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Sajt NetworkManagera"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Ihar Hračyška <ihar.hrachyshka@gmail.com>"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -1000,35 +1050,35 @@ msgstr ""
 "Aplet NetworkManager nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
 "glade nia znojdzieny)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Parol dla sietki „Mobile Broadband”"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Kab spałučycca z sietkaju „%s”, treba padać parol."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 #, fuzzy
 msgid "SIM PIN unlock required"
 msgstr "Vymahaje kodu PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 #, fuzzy
 msgid "SIM PIN Unlock Required"
 msgstr "Vymahaje kodu PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1036,28 +1086,28 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 #, fuzzy
 msgid "PIN code:"
 msgstr "Vymahaje kodu PIN"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 #, fuzzy
 msgid "SIM PUK unlock required"
 msgstr "Vymahaje kodu PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 #, fuzzy
 msgid "SIM PUK Unlock Required"
 msgstr "Vymahaje kodu PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,79 +1115,86 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 #, fuzzy
 msgid "PUK code:"
 msgstr "Vymahaje kodu PUK"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Źviestki ab spałučeńni"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 #, fuzzy
 msgid "Ig_nore automatically obtained routes"
 msgstr "Nie zvažaj na aŭtamatyčna atrymanyja maršruty"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 "Vykarystaj hetaje spałučeńnie tolki dla suviazi z resursami ŭ jahonaj sietcy"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1145,17 +1202,17 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, hetaje spałučeńnie nikoli nia budzie "
 "zmoŭčanym sietkavym spałučeńniem."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "_Stvary"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Stvary spałučeńnie CDMA"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1168,661 +1225,811 @@ msgstr ""
 "Vybiery typ VPN dla novaha spałučeńnia. Kali patrebnaha typu niama ŭ śpisie, "
 "tady pasprabuj zainstalavać patrebny plugin VPN."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Słužba:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Tranślacyjny adras:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Režym:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Interfejs:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Pieršy DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajtaŭ"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
-msgstr ""
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
+msgstr "Pieršy DNS:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Uklučy _sietkavyja pasłuhi"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "aŭtamatyčna"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "zmoŭčana"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adras _MAC:"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adras"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Aparatny adras:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Słužba:"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Niemahčyma ŭruchomić spałučeńnia VPN \"%s\" praz pamyłku spałučeńnia."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Užyj biaśpieku dla hetaha spałučeńnia 802.1X"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 #, fuzzy
 msgid "FIP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
-msgid "_Username:"
+msgid "_Username"
 msgstr "Karystalnik:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
 #, fuzzy
-msgid "_Service:"
+msgid "_Service"
 msgstr "Słužba:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 #, fuzzy
 msgid "Sho_w password"
 msgstr "Pakažy parol"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Parol:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfejs"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfejs:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfejs:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "aŭtamatyčna"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 #, fuzzy
 msgid "10 Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 #, fuzzy
 msgid "100 Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ihnaruj"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Uručnuju"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "Słužba:"
+msgid "_Port"
+msgstr "_Port:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Adras _MAC:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Pakažy parol"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "zmoŭčana"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ihnaruj"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Tranślacyjny adras:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Pakažy parol"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Chutkaść:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Poŭny _dupleks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 ""
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Tak"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Nie"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Źviestki ab spałučeńni"
+msgid "_Metered connection"
+msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Spałučajsia aŭtamatyčna"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1830,982 +2037,1094 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "Adras"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_Spałučy"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Słužba:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 #, fuzzy
 msgid "Link-Local"
 msgstr "Tolki miascovaje spałučeńnie"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Supolny ź inšymi kamputarami"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
-msgid "_Method:"
+msgid "_Method"
 msgstr "Metad:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
-msgid "D_HCP client ID:"
+msgid "D_HCP client ID"
 msgstr "Identyfikatar klijenta DHCP:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "Dameny pošuku:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
-msgid "DNS ser_vers:"
+msgid "DNS ser_vers"
 msgstr "Servery DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 #, fuzzy
 msgid "_Routes…"
 msgstr "Maršruty..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metryka"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Impartuj"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
-msgid "Nu_mber:"
+msgid "Nu_mber"
 msgstr "Numar:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 #, fuzzy
 msgid "Advanced"
 msgstr "<b>Asablivaje</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 #, fuzzy
-msgid "_APN:"
+msgid "_APN"
 msgstr "APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "Sietka:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Stvary..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "Pakažy paroli"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "Aŭtaryzacyja:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Dazvolenyja sposaby aŭtaryzacyi:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 #, fuzzy
 msgid "Configure _Methods…"
 msgstr "Naładź sposaby aŭtaryzacyi..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "<b>Kampresija</b>"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 #, fuzzy
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Užyj šyfravańnie PPP (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 #, fuzzy
 msgid "_Require 128-bit encryption"
 msgstr "Vymahaj 128-bitavaje šyfravańnie"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 #, fuzzy
 msgid "Use _stateful MPPE"
 msgstr "Užyj poŭnastanavy MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 #, fuzzy
 msgid "Allow _BSD data compression"
 msgstr "Dazvol kampresiju BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 #, fuzzy
 msgid "Allow _Deflate data compression"
 msgstr "Dazvol kampresiju Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 #, fuzzy
 msgid "Use TCP _header compression"
 msgstr "Užyj kampresiju zahałoŭkaŭ TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 #, fuzzy
 msgid "Send PPP _echo packets"
 msgstr "Vysyłaj rechavyja pakunki PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "Metad:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Niama"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "Metad:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "<b>Asablivaje</b>"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Dracianyja sietki"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "LACP port _key:"
+msgid "_LACP port priority"
 msgstr "Pryvatny kluč:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+msgid "LACP port _key"
+msgstr "Pryvatny kluč:"
+
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interfejs:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_Ručnaja kanfihuracyja"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "_Ručnaja kanfihuracyja"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Auto 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Aparatny adras:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Aparatny adras:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Siła pieradačy:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Siła pieradačy:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Interfejs:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Interfejs:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Adras _MAC:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Biaśpieka:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Siła pieradačy:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Častata:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanał:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Pałasa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 #, fuzzy
 msgid "No polkit authorization to perform the action"
 msgstr "Kiepskaja aŭtaryzacyja praz PolicyKit."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "<b>Dazvolenyja sposaby aŭtaryzacyi</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 #, fuzzy
 msgid "_MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 #, fuzzy
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2815,192 +3134,187 @@ msgstr ""
 "aŭtaryzacyi. Kali spałučeńni chibiać, pasprabuj vyklučyć niekatoryja sposaby "
 "aŭtaryzacyi.</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Plugin VPN nia zmoh narmalna zimpartavać spałučeńnie\n"
-"\n"
-"Pamyłka: nie staje typu słužby VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Niemahčyma zimpartavać spałučeńnie VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Nie ŭdałosia pračytać fajł \"%s\", albo jon nie źmiaščaje zrazumiełyja "
-"źviestki pra spałučeńnie VPN\n"
+"Plugin VPN nia zmoh narmalna zimpartavać spałučeńnie\n"
 "\n"
-"Pamyłka: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Nieviadoma"
+"Pamyłka: nie staje typu słužby VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Vybiery fajł, kab zimpartavać"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Aparatny adras:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Ekspartuj spałučeńnie VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "Stvary spałučeńnie GSM"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 #, fuzzy
 msgid "Connection delete failed"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ty sapraŭdy chočaš vydalić spałučeńnie %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Spałučeńni _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adras"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Sietkavaja maska"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Sietkavaja brama"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metryka"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Redahavańnie %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Redahavańnie spałučeńnia biaz nazvy"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nazva spałučeńnia:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Pamyłka inicyjalizacyi źviestak sertyfikatu: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Spałučeńnie ŭstalavanaje"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -3009,106 +3323,104 @@ msgstr ""
 "Redaktar spałučeńnia nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
 "glade nia znojdzieny)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Aŭtaryzuj, kab zrabić hetaje spałučeńnie dastupnym dla ŭsich karystalnikaŭ "
 "kamputara."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Stvary spałučeńnie GSM"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 #, fuzzy
 msgid "Error initializing editor"
 msgstr "Pamyłka inicyjalizacyi źviestak sertyfikatu: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 #, fuzzy
 msgid "Connection add failed"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nazva spałučeńnia:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Ekspartuj"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nikoli"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ciapier"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3116,7 +3428,7 @@ msgstr[0] "%d chvilina tamu"
 msgstr[1] "%d chviliny tamu"
 msgstr[2] "%d chvilinaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3124,7 +3436,7 @@ msgstr[0] "%d hadzina tamu"
 msgstr[1] "%d hadziny tamu"
 msgstr[2] "%d hadzinaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3132,7 +3444,7 @@ msgstr[0] "%d dzień tamu"
 msgstr[1] "%d dni tamu"
 msgstr[2] "%d dzion tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3140,7 +3452,7 @@ msgstr[0] "%d miesiac tamu"
 msgstr[1] "%d miesiacy tamu"
 msgstr[2] "%d miesiacaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3148,130 +3460,175 @@ msgstr[0] "%d hod tamu"
 msgstr[1] "%d hady tamu"
 msgstr[2] "%d hadoŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Spałučeńnie ŭstalavanaje"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nazva"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "Redahuj zaznačanaje spałučeńnie VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Vydal zaznačanaje spałučeńnie VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Vydal zaznačanaje spałučeńnie VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Vydal zaznačanaje spałučeńnie VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Spałučeńnie „Mobile Broadband”"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Kiruj sietkavymi spałučeńniami"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Redahavańnie spałučeńnia biaz nazvy"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Spałučeńnie ŭstalavanaje"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Kiruj sietkavymi spałučeńniami"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Redahavańnie spałučeńnia biaz nazvy"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Sietkavyja spałučeńni"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Spałučeńni _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Biaśpieka 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Užyj biaśpieku dla hetaha spałučeńnia 802.1X"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "_Uvajdzi ŭ sietku"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "_Dracianaja sietka"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Pieršy DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Dracianoje spałučeńnie %d"
@@ -3279,90 +3636,94 @@ msgstr "Dracianoje spałučeńnie %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 #, fuzzy
 msgid "Could not load DSL user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfejs:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Spałučeńnie DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ihnaruj"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 #, fuzzy
 msgid "Wake-on-LAN password"
 msgstr "Pakažy parol"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 #, fuzzy
 msgid "Default"
 msgstr "zmoŭčana"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3370,281 +3731,279 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Aŭtamatyčna (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 #, fuzzy
 msgid "Automatic, addresses only"
 msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Aŭtamatyčna (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Tolki aŭtamatyčnyja adrasy (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Aŭtamatyčna (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Tolki aŭtamatyčnyja adrasy (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Tolki miascovaje spałučeńnie"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "Servery DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "Dameny pošuku:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redahavańnie maršrutaŭ IPv4 dla %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Nałady IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 #, fuzzy
 msgid "Automatic, DHCP only"
 msgstr "Aŭtamatyčna (DHCP)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, fuzzy, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redahavańnie maršrutaŭ IPv4 dla %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 #, fuzzy
 msgid "IPv6 Settings"
 msgstr "Nałady IPv4"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Spałučeńnie CDMA %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 #, fuzzy
 msgid "Unsupported mobile broadband connection type."
 msgstr "Spałučeńnie „Mobile Broadband”"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 #, fuzzy
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mabilny Broadband"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 #, fuzzy
 msgid "CDMA"
 msgstr "CDMA (%s)"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "niama"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Źmianieńnie sposabaŭ aŭtaryzacyi PPP dla %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Nałady PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 #, fuzzy
 msgid "Could not load PPP user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Dracianoje spałučeńnie %d"
@@ -3652,11 +4011,11 @@ msgstr "Dracianoje spałučeńnie %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Niemahčyma dekadavać pryvatny kluč."
@@ -3664,60 +4023,60 @@ msgstr "Niemahčyma dekadavać pryvatny kluč."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Spałučeńnie VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "Niemahčyma dekadavać pryvatny kluč."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Spałučeńnie VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Stvary spałučeńnie VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3729,108 +4088,106 @@ msgstr ""
 "Vybiery typ VPN dla novaha spałučeńnia. Kali patrebnaha typu niama ŭ śpisie, "
 "tady pasprabuj zainstalavać patrebny plugin VPN."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitavy kluč"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parolnaja fraza"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamičny WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Biazdrotavaja biaśpieka"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Fajł „%s” užo isnuje."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Zamiani"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ci chočaš zamianić %s novym spałučeńniem VPN?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nie ŭdałosia zekspartavać spałučeńnie VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3841,404 +4198,365 @@ msgstr ""
 "\n"
 "Pamyłka: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Ekspartuj spałučeńnie VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Źviestki ab spałučeńni"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "Sietkavyja spałučeńni"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertyfikat CA:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Pryvatny kluč:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Parol pryvatnaha kluča:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Sertyfikat karystalnika:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-#, fuzzy
-msgid "Your Device:"
-msgstr "Słužba:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "Zainstalavanaja pryłada GSM"
+
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "Pryłada CDMA zainstalavanaja"
+
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 #, fuzzy
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
+msgid "New Mobile Broadband Connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
-msgstr ""
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+#, fuzzy
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr ""
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+#, fuzzy
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Abiary svoj pryvatny kluč..."
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 #, fuzzy
 msgid "Choose your Provider"
 msgstr "Abiary svoj pryvatny kluč..."
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Abiary svoj pryvatny kluč..."
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "Zainstalavanaja pryłada GSM"
-
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "Pryłada CDMA zainstalavanaja"
-
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr ""
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+#, fuzzy
+msgid "Your Device:"
+msgstr "Słužba:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-#, fuzzy
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
-
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-#, fuzzy
-msgid "Set up a Mobile Broadband Connection"
-msgstr "Spałučeńnie „Mobile Broadband”"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 #, fuzzy
-msgid "New Mobile Broadband Connection"
-msgstr "Spałučeńnie „Mobile Broadband”"
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(niama)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Sertyfikat CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Nieviadoma"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Abiary fajł"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 #, fuzzy
 msgid "Cancel"
 msgstr "gtk-cancel"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Abiary fajł"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Sertyfikat karystalnika:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Redahavańnie spałučeńnia biaz nazvy"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Kab spałučycca z sietkaju „%s”, treba padać parol."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Parol:"
+msgid "Sh_ow passwords"
+msgstr "Pakažy paroli"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Parol:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "Pakažy paroli"
+msgid "_Secondary Password:"
+msgstr "_Parol:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Parol:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Aŭtamatyčna spałučaj"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Niama"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamičny WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Stvary"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4246,42 +4564,42 @@ msgstr ""
 "Kab atrymać dostup da biazdrotavaj sietki \"%s\", vymahajucca paroli ci "
 "klučy šyfravańnia."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Stvary novuju biazdrotavuju sietku"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Novaja biazdrotavaja sietka"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Akreśl nazvu biazdrotavaj sietki, jakuju chočaš stvaryć."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Schavanaja biazdrotavaja sietka"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4290,38 +4608,54 @@ msgstr ""
 "Akreśli nazvu j nałady biaśpieki dla schavanaj biazdrotavaj sietki, ź jakoj "
 "chočaš spałučycca."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "Biazdrotavaja biaśpieka"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "Spałučeńnie:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Biazdrotavy _adapter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Dracianoje"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4331,410 +4665,432 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Nazva sietki:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Spałučeńnie:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Biazdrotavy _adapter:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "Dracianaja sietka (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "Dracianaja sietka"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Dracianaja sietka (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "_Uvajdzi ŭ sietku"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Vymahaje kodu PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Spałučeńnie „Mobile Broadband” z „%s” dziejničaje"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Spałučeńnie:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Sertyfikaty DER ci PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Pryvatnyja klučy DER, PEM ci PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Abiary sertyfikat CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Ananimnaja tojesnaść:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Aŭtaryzacyja:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
-msgid "Anony_mous identity:"
+msgid "Anony_mous identity"
 msgstr "Ananimnaja tojesnaść:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Unutranaja aŭtaryzacyja:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Abiary sertyfikat ad daviernych orhanaŭ..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 #, fuzzy
 msgid "Version 0"
 msgstr ""
 "Versija 0\n"
 "Versija 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 #, fuzzy
 msgid "Version 1"
 msgstr ""
 "Versija 0\n"
 "Versija 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-#, fuzzy
-msgid "C_A certificate:"
-msgstr "Sertyfikat CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "Versija PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit Parolnaja fraza"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Pakažy parolnuju frazu"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertyfikat karystalnika:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "Abiary sertyfikat CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "Tojesnaść:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunelavany TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Abaronieny EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "Aŭtaryzacyja:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
+msgid "Open System"
+msgstr "Adkrytaja systema"
+
+#: src/wireless-security/ws-wep-key.ui:15
+#, fuzzy
+msgid "Shared Key"
+msgstr "Papiarednie supolny kluč WPA"
+
+#: src/wireless-security/ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -4743,47 +5099,89 @@ msgstr ""
 "3\n"
 "4"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Open System"
-msgstr "Adkrytaja systema"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-#, fuzzy
-msgid "Shared Key"
-msgstr "Papiarednie supolny kluč WPA"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
-msgid "_Key:"
+msgid "_Key"
 msgstr "Kluč:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 #, fuzzy
 msgid "Sho_w key"
 msgstr "Pakažy kluč"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
-msgid "WEP inde_x:"
+msgid "WEP inde_x"
 msgstr "Indeks WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
-msgid "_Type:"
+msgid "_Type"
 msgstr "Typ:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "zmoŭčana"
+
+#, fuzzy
+#~ msgid "Ignored"
+#~ msgstr "Ihnaruj"
+
+#, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Niemahčyma ŭruchomić spałučeńnia VPN \"%s\" praz pamyłku spałučeńnia."
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Źviestki ab spałučeńni"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Niemahčyma zimpartavać spałučeńnie VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Nie ŭdałosia pračytać fajł \"%s\", albo jon nie źmiaščaje zrazumiełyja "
+#~ "źviestki pra spałučeńnie VPN\n"
+#~ "\n"
+#~ "Pamyłka: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Nieviadoma"
+
+#, fuzzy
+#~ msgid "Active Network Connections"
+#~ msgstr "Sietkavyja spałučeńni"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Abiary sertyfikat ad daviernych orhanaŭ..."
+
+#, fuzzy
+#~ msgid "C_A certificate:"
+#~ msgstr "Sertyfikat CA:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Sietkavy kiraŭnik"
 
@@ -4869,12 +5267,6 @@ msgstr "Typ:"
 #~ msgid "Wireless network connection '%s' active"
 #~ msgstr "Biazdrotavaje sietkavaje spałučeńnie \"%s\" dziejničaje"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Druhi DNS:"
-
-#~ msgid "translator-credits"
-#~ msgstr "Ihar Hračyška <ihar.hrachyshka@gmail.com>"
-
 #~ msgid "_Help"
 #~ msgstr "_Dapamoha"
 
@@ -4894,9 +5286,6 @@ msgstr "Typ:"
 #~ msgid "Don't warn me again"
 #~ msgstr "Bolš nie nahadvaj"
 
-#~ msgid "No"
-#~ msgstr "Nie"
-
 #~ msgid ""
 #~ "Open System\n"
 #~ "Shared Key"
@@ -4910,9 +5299,6 @@ msgstr "Typ:"
 #~ msgid "User Name:"
 #~ msgstr "Nazva karystalnika:"
 
-#~ msgid "Yes"
-#~ msgstr "Tak"
-
 #~ msgid "_Wireless Security:"
 #~ msgstr "_Biazdrotavaja biaśpieka:"
 
@@ -5058,12 +5444,6 @@ msgstr "Typ:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Dastupnaje dla ŭsich karystalnikaŭ"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "_Spałučajsia aŭtamatyčna"
-
-#~ msgid "_Import"
-#~ msgstr "_Impartuj"
-
 #~ msgid "PolicyKit authorization could not be created."
 #~ msgstr "Nie ŭdałosia stvaryć aŭtaryzacyju PolicyKit."
 
@@ -5095,9 +5475,6 @@ msgstr "Typ:"
 #~ msgid "GSM connection %d"
 #~ msgstr "Spałučeńnie GSM %d"
 
-#~ msgid "CDMA connection %d"
-#~ msgstr "Spałučeńnie CDMA %d"
-
 #~ msgid "Cannot start VPN connection '%s'"
 #~ msgstr "Niemahčyma ŭruchomić spałučeńnie VPN \"%s\""
 
@@ -5360,9 +5737,6 @@ msgstr "Typ:"
 #~ msgid "Passphrase:"
 #~ msgstr "Parolnaja fraza:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Pakažy parolnuju frazu"
-
 #~ msgid "Auto CDMA dialup connection"
 #~ msgstr "Spałučeńnie Auto CDMA"
 
diff --git a/po/bg.po b/po/bg.po
index 99485374..6a41c7a4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-10-09 19:44+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -21,49 +22,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Управление на мрежовите връзки"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Мрежови връзки"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Активни мрежови връзки"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Управление и промяна на настройките на вашата мрежа"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Изключване на уведомяването за установяването на връзки"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Задайте да е истина, за да изключите уведомяванията при установяване на "
 "връзка към мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Изключване на уведомяването за прекъсване на връзки"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Задайте да е истина, за да изключите уведомяванията при прекъсването на "
 "връзка към мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Изключване на уведомяванията за ВЧМ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -71,51 +81,52 @@ msgstr ""
 "Задайте да е истина, за да изключите уведомяванията при прекъсването на "
 "връзка към ВЧМ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Без уведомявания за наличие на безжични мрежи"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Задайте да е истина, за да изключите уведомяванията при наличие на безжични "
 "мрежи."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Мигриране"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Ключът указва дали настройките да се мигрират към нова версия."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Забраняване на създаването на безжична мрежа"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Задайте да е истина, за да се забрани създаването на инцидентни мрежи (ад "
 "хок) чрез този аплет."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Показване на оплета в областта за уведомяване"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Задайте да лъжа, за да изключите показването на аплета в областта за "
 "уведомяване"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Избор на сертификат от сертифициращ орган"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -123,7 +134,7 @@ msgstr ""
 "Задайте да е истина, за да се изключат предупрежденията за сертификатите на "
 "сертифициращите органи при ползване на EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -132,130 +143,143 @@ msgstr ""
 "сертифициращите органи във втората фаза на идентификацията при ползване на "
 "EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Аплетът NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Няма връзка към мрежа"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Аплетът NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Идентификация 802.1Х"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Свързване"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Име на мрежа:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Инцидентна (ад хок)"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Неуспешно добавяне/задействане на връзка"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Неуспешно установяване на връзка"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Неуспешно прекъсване на връзка"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Неуспешно прекъсване"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Неуспешно задействане на връзка"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Това съобщение да не се показва повече"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ прекъсна, защото мрежовата връзка беше прекъсната."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото мрежовата връзка беше прекъсната."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -284,7 +308,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ спря неочаквано."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +319,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ върна грешни "
 "настройки."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -304,7 +328,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото времето за опити изтече."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ не стартира "
 "навреме."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ не успя да "
 "стартира."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +357,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото нямаше валидни тайни за ВЧМ."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -342,7 +366,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, поради невалидни тайни за ВЧМ."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -351,7 +375,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -362,19 +386,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Успешна връзка към ВЧМ.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Съобщение при идентификация пред ВЧМ"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Връзката към ВЧМ е неуспешна"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -388,7 +412,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -401,561 +425,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "устройството не е готово (липсва фърмуер)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "устройството не е готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "връзката е прекъсната"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr " Прекъсване"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "устройството не се управлява"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Не са налични мрежови устройства"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_Връзки към ВЧМ"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Настройване на ВЧМ…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_Връзки към ВЧМ"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager не е включен…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Изключена мрежа"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Включване на мрежата"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Включване на _безжичната мрежа"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Включване на _мобилна връзка"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Включване на _уведомяване"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Информация за връзката"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Настройки на връзките…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Относно"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Свързани сте към „%s“."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Без връзка"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Връзката към мрежата е прекъсната."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Подготовка на връзката „%s“…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Изисква се идентификация на потребител за връзката „%s“…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Заявка за мрежов адрес за „%s“…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Жичната връзка „%s“ е активна"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Стартиране на връзката към ВЧМ „%s“…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Изисква се идентификация на потребител за връзката към ВЧМ „%s“…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Изискване на адрес за ВЧМ за „%s“…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Връзката към ВЧМ „%s“ е активна"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Няма връзка към мрежа"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Аплетът NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK-ът е грешен. Свържете се с доставчика на услугата."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN-ът е грешен. Свържете се с доставчика на услугата."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Изпращане на отключващия код…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобилна връзка (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобилна връзка"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Налични мрежи"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Нова мобилна връзка"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Връзката е осъществена"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Свързани сте към мобилната мрежа."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Парола за мобилна мрежа."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Регистрирани сте в домашната мрежа."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Регистрирани сте в мрежа с роуминг."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Свързани сте към мобилна мрежа."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Подготовка на мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Настройване на мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Необходима е идентификация на потребител за мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Мобилната връзка „%s“ е активна"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Автоматична мрежа по Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Жични мрежи (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Жична мрежа (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Жични мрежи"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Жична мрежа"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Свързани сте към жичната мрежа."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Подготовка на жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Настройване на жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Изисква се идентификация на потребител за жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Заявка за жичен мрежов адрес за „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Жичната връзка „%s“ е активна"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Идентификация за DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Свързване към скрита безжична мрежа"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(нищо)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Неуспешно добавяне на нова връзка"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Безжични мрежи (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Жична мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Безжична мрежа"
 msgstr[1] "Безжични мрежи"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Изключен Wi-Fi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi е изключен от хардуерен ключ"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Още мрежи"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Достъпни са безжични мрежи"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Използвайте менюто с наличните мрежи, за да се свържете"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Свързани сте към безжичната мрежа „%s“."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Подготовка на безжичната връзка „%s“…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Настройване на безжична връзка „%s“…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Изисква се идентификация на потребител за безжична мрежа „%s“…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Заявка за мрежов адрес за „%s“…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Безжичната връзка „%s“ е активна: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Безжичната връзка „%s“ е активна"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Неуспешно задействане на връзка"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Грешка при показване на информацията за връзката:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамичен WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Адреси"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Без"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (стандартно)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Неопределена"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Неопределен"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP адрес"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Адрес за разпръскване"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Неопределена"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Маска на подмрежата"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Основен:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Втора парола:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Общи"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Хардуерен адрес"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Скорост"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Защита:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Маршрут по подразбиране"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Игнорирана"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Парола:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Вид ВЧМ"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Шлюз за ВЧМ"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Потребител за ВЧМ"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Известие за ВЧМ"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Основна връзка"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Неопределена"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Не са намерени активни връзки!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -963,18 +1011,22 @@ msgstr ""
 "Авторски права © 2005-2008 Novell, Inc.\n"
 "и още много сътрудници и преводачи"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет за областта за уведомяване за управление на мрежовите устройства и "
 "връзки."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Уеб сайт на NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -982,33 +1034,33 @@ msgstr ""
 "Аплетът NetworkManager не можа да открие някои задължителни ресурси (файлът ."
 "ui не е намерен)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Липсващи ресурси"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Парола за мобилна връзка"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "За свързване към „%s“ се изисква парола."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Необходим е PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Необходим е PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1018,25 +1070,25 @@ msgstr ""
 "свърже."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Показване на PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Необходим е PUK за SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Необходим е PUK за отключване на SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1046,35 +1098,42 @@ msgstr ""
 "използва."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Нов PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Повторете PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Показване на 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Информация за връзката"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Не може да се създаде комутируема връзка: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1083,41 +1142,41 @@ msgstr ""
 "IP адресите идентифицират вашия компютър в мрежата. Натиснете бутона "
 "„Добавяне“, за да добавите IP адрес."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Изтриване"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Иг_нориране на автоматично получени маршрути"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Използване на тази връзк_а само за ресурси в собствената си мрежа"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1125,16 +1184,16 @@ msgstr ""
 "Ако е включено, тази връзка никога няма да се използва като стандартната "
 "мрежова връзка."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Създаване…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Изберете вид връзка"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1146,85 +1205,100 @@ msgstr ""
 "Ако видът, който искате да ползвате го няма в списъка, ще трябва да "
 "инсталирате съответната приставка за ВЧМ."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Услуга:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Активно архивиране"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Разпръскване"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Адаптивно разпределяне на излъчването"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Адаптивно разпределяне на натоварването"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (препоръчва се)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Обединени връзки:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "Р_ежим:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Честота на о_бновяване:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "мс"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Име:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Наблюдаване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Цели на ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1232,19 +1306,22 @@ msgstr ""
 "Адрес или списък от адреси разделени със запетая за проверка състоянието на "
 "връзката."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Време за _осъществяване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Време за _прекъсване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Основен:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1252,105 +1329,163 @@ 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MT_U:"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байта"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Забав_яне:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Връщане по интерфейса:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Мостови _връзки:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Закъснение при пренасочване:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Време на поздрав:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "сек."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Включване на мрежата"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_Включване на STP (протокол на обхващащото дърво)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Максимална възраст:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Време на подравняване:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматично"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "стандартно"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Включване"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1361,198 +1496,238 @@ msgstr ""
 "хардуерен адрес. Номерът е известен като клониране или подмяна на хардуерен "
 "адрес. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Интерфейс за VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Хардуерен адрес:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Което и да е устройство"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Неуспешно обновяване на тайните на мрежовата връзка поради непозната грешка."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Използване на мост в център за данни за тази връзка"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Контрол на потока"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Възможност"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Включване"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Оповестяване"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Готовност"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Настройки…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Групи по приоритет"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Тъкан"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Контрол на потока по приоритет"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Включване или изключване на паузата при предаване за приоритета за всеки "
 "потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Приоритет:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Клас на данните:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Точна широчина на лентата:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Широчина на лентата за приоритета:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Група на приоритета:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Идентификатор на групата:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Въведете идентификатора за групата за приоритет за всеки потребителски "
 "приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1561,246 +1736,308 @@ msgstr ""
 "всяка група приоритет. Сборът от процентите на всички групи трябва да е 100 "
 "%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Въведете частта от широчината на честотната лента за група в проценти за "
 "всеки потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Включване или изключване на точната широчина на честотната лента за всеки "
 "потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Въведете класа на данните за всеки потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Потребител:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Услуга:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Показ_ване на паролата"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Парола:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Интерфейс"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Основен интерфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Основен интерфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Усукана двойка (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Интерфейс за прикачване на данни (AUI — 15 пина)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Интерфейс независим от носителя (MII — 40 пина)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Игнориране"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ръчно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Порт:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Услуга:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Подменен хардуерен адрес:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Парола за _частен ключ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Стандартна"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Игнориране"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Разпръскване"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Парола за _частен ключ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Скорост:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Пълен дупле_кс"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "_Автоматично свързване чрез ВЧМ при свързване към тази връзка"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Без"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "_Всички могат да се свързват към тази мрежа"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Автоматично свързване към тази мрежа"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "_Автоматично свързване чрез ВЧМ при свързване към тази връзка"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "_Зона:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Информация за връзката"
+msgid "_Metered connection"
+msgstr "_Обединени връзки:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Иг_нориране на автоматично получени маршрути"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Зона:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1809,7 +2046,7 @@ msgstr ""
 "IP адресите идентифицират вашия компютър в мрежата. Натиснете бутона "
 "„Добавяне“, за да добавите IP адрес."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1817,128 +2054,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Автоматично, само адреси"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Режим на прехвърляне:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Дейтаграма"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Свързана"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Режим на прехвърляне:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Име на устройство + номер"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "Р_ежим:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматично с ръчни настройки за DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Локално за връзката (169.254.0.0/16, fe80::/10)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Споделена с други компютри"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Метод:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1949,8 +2190,8 @@ msgstr ""
 "настрои компютъра ви. Ако искате да използвате такъв идентификатор, въведете "
 "го тук."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1958,25 +2199,26 @@ msgstr ""
 "Домейните за откриването на имената на хостовете. Използвайте запетаи, за да "
 "разделяте домейните."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "Номе_р на клиент за DHCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Домейни за търсене:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_Сървъри за DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1984,11 +2226,11 @@ msgstr ""
 "IP адреси на сървърите за откриването на имената на хостовете (DNS). "
 "Използвайте запетаи, за да разделяте домейните."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Изискване на адрес по протокола IPv_4 за успешно свързване"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1996,26 +2238,36 @@ msgstr ""
 "Свързването ще се счита за успешно при свързване към мрежи, използващи "
 "протокола IPv6, дори и при неуспешно настройване на IPv4."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Маршрути…"
 
 # Става дума за вида връзка
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Изключена"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Включена (предпочитане на публичния адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Включена (предпочитане на временния адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Включване"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2026,15 +2278,20 @@ msgstr ""
 "за връзката (link-local), автоматично ще бъдат причислени към съответния "
 "интерфейс."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Разширения на IPv6 за защита на _личните данни:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Изискване на адрес по протокола IPv_6 за успешно свързване"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2042,757 +2299,863 @@ msgstr ""
 "Свързването ще се счита за успешно при свързване към мрежи, използващи "
 "протокола IPv4, дори и при неуспешно настройване на IPv6."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Метрични"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Основна"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Но_мер:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Допълнителни"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "М_режа (ид.):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Промяна…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "ПИ_Н:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Позволяване на _роуминг, когато домашната мрежа не е налична"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Пока_зване на паролите"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Идентификация"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Позволени методи:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Настройване на _методите…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Компресия"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Използване на шифриране от точка до точка (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Изискване на 128 битово шифроване"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Използване на MPPE със _запазване на състоянието"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Позволяване _компресиране на данни — BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Позволяване ко_мпресиране на данни — Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Използване на компресия в _заглавните части на TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Ехо"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Изпращане на пакети _ехо по PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Метод:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Без"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Внасяне на настройки за обединени връзки от файл…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Метод:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Допълнителни"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Жични мрежи"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Приоритет:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Частен _ключ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Време за _осъществяване на връзка:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Време за _прекъсване на връзка:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Цели на ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Цели на ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Внасяне на настройки за обединени връзки от файл…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_Настройки в JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Група на приоритета:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Приоритет"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Обединени връзки:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Хардуерен адрес:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Хардуерен адрес:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Сила на предава_не:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Сила на предава_не:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Основен интерфейс:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Интерфейс за VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Подменен хардуерен адрес:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "И_дентификатор за VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Име на устройство + номер"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Защ_ита:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Инцидентна (ад хок)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Сила на предава_не:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Скорост:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "К_анал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Честотна _лента:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Позволени методи за идентификация"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Разширяем протокол (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Протокол с парола (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Протокол с предизвикателство и ръкостискане (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Протокол с предизвикателство и ръкостискане на Майкрософт (MS CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Протокол с предизвикателство и ръкостискане на Майкрософт, версия 2 (MS CHAP "
 "v2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2802,110 +3165,99 @@ msgstr ""
 "идентификация. Ако връзките са неуспешни, опитайте с изключване на "
 "поддръжката на някои методи."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Безжична мрежа"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Свързване"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Обединяване"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мрежов мост"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "ВЧМ"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Приставката за ВЧМ не успя да внесе връзка към ВЧМ\n"
-"\n"
-"Грешка: видът услуга на ВЧМ липсва."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Връзка към ВЧМ не може да бъде внесена"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Файлът „%s“ не може да се прочете или не съдържа данни за връзка към ВЧМ\n"
+"Приставката за ВЧМ не успя да внесе връзка към ВЧМ\n"
 "\n"
-"Грешка: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Непозната грешка"
+"Грешка: видът услуга на ВЧМ липсва."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Избор на файл за внасяне"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Виртуална"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Внасяне на конфигурация към ВЧМ…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2913,79 +3265,86 @@ msgstr ""
 "Прозорецът на редактора на връзки не може да се инициализира поради "
 "неизвестна грешка."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не може да се създаде нова връзка"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Неуспешно изтриване на връзка"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Сигурни ли сте, че искате да изтриете връзката „%s“?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_Връзки към ВЧМ"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Мрежова маска"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрични"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Представка"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Настройки на „%s“"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Редактиране на връзка без име"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "И_ме на връзка:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Грешка при инициализиране на редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Неуспешно добавяне на връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2993,55 +3352,52 @@ msgstr ""
 "Редакторът на връзки не може да намери някои задължителни ресурси (файлът с "
 "интерфейса не беше намерен)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Запазване на промените в настройките на връзката."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Идентифицирайте се, за да запазите тази връзка за всички потребители на този "
 "компютър."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Не може да се създаде връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не може да се редактира връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Грешка при създаване на прозорец за редактиране на връзка."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Грешка при инициализиране на редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Неуспешно добавяне на връзка"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3050,202 +3406,248 @@ msgstr ""
 "Задайте да е истина, за да се изключат предупрежденията за сертификатите на "
 "сертифициращите органи при ползване на EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "И_ме на връзка:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Изнасяне…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "никога"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "сега"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d час"
 msgstr[1] "преди %d часа"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d месец"
 msgstr[1] "преди %d месеца"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "преди %d година"
 msgstr[1] "преди %d години"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Неуспешно добавяне на връзка"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Обединена връзка %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Обединена връзка %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Име"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Последно използвана"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Редактиране на избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Идентифицирайте се, за да редактирате избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Изтриване на избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Идентифицирайте се, за да изтриете избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Неподдържан вид мобилна връзка."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Не може да се създават връзки от вида „%s"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Грешка при редактиране на връзката"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Грешка при създаване на връзката"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Неуспешно добавяне на връзка"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Липсват приставки за ВЧМ."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Не може да се създават връзки от вида „%s"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Грешка при редактиране на връзката"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Не може да се открие връзка с идентификатор „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Мрежови връзки"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_Връзки към ВЧМ"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Защита на 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Потребителският интерфейс за сигурност на 802.1X не може да се зареди."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Използване на защита на 802.1_X за тази връзка"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 "Потребителският интерфейс за мост в център за данни (DCB) не може да се "
 "зареди."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Свързана връзка %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Жична мрежа"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Безжична мрежа"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "Потребителският интерфейс за свързване на интерфейси не може да се зареди."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Основен:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Свързана връзка %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Потребителският интерфейс за мрежови мост не може да се зареди."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Мрежови мост %d"
@@ -3253,35 +3655,40 @@ msgstr "Мрежови мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Порт за мрежови мост"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Потребителският интерфейс за порта за мрежови мост не може да се зареди."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "Мост в център за данни (DCB)"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 "Потребителският интерфейс за мост в център за данни (DCB) не може да се "
 "зареди."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Потребителският интерфейс за DSL не може да се зареди."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Основен интерфейс:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Връзка по DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3292,44 +3699,43 @@ msgstr ""
 "мрежовото устройство с указания тук постоянен хардуерен адрес. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Игнорирана"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Потребителският интерфейс за жична мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Подменен хардуерен адрес:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Жична връзка %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Стандартна"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3340,11 +3746,11 @@ msgstr ""
 "защитната стена. Естествено тази схема може да се ползва, само ако защитната "
 "стена (firewalld) е включена."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Началният потребителският интерфейс не може да се зареди."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3356,158 +3762,162 @@ msgstr ""
 "мрежовото устройство с указания тук постоянен хардуерен адрес. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Потребителският интерфейс за InfiniBand не може да се зареди."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Връзка по InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Потребителският интерфейс за IPv4 не може да се зареди."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Жична връзка %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Автоматично (ВЧМ)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматично (ВЧМ), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Автоматично, само адреси"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Автоматично (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматично (PPPoE), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Автоматично (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматично (DHCP), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Само локално за връзката (169.254.0.0/16, fe80::/10)"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "_Допълнителни сървъри за DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Допълнителни _търсени домейни:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Редактиране на маршрути по IPv4 за %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Настройки на IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Потребителският интерфейс за IPv4 не може да се зареди."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Автоматично, само DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Редактиране на маршрути по IPv6 за „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Настройки на IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Потребителският интерфейс на IPv6 не може да се зареди."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Потребителският интерфейс за WiMAX не може да се зареди."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Връзка по WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Подчинени устройства на един интерфейс"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Устройствата „%s“ и „%s“ са подчинени на устройството „%s“"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3516,25 +3926,25 @@ msgstr ""
 "Устройствата „%s“ и „%s“ са подчинени на два различни виртуални порта („%s“ "
 "и „%s“) на едно физическо устройство."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s подчинен %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Потребителският интерфейс за мобилна връзка не може да се зареди."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Неподдържан вид мобилна връзка."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изберете вида на доставчика на мобилен Интернет"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3543,92 +3953,88 @@ msgstr ""
 "Изберете технологията, която се използва от вашия мобилен доставчик. Ако не "
 "сте сигурни, го попитайте."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "_Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Доставчикът използва _технология чрез CDMA (като 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "никакъв"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Редактиране на методите на идентификация чрез PPP за %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Настройки на PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Потребителският интерфейс за PPP не може да се зареди."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr ""
 "Потребителският интерфейс за свързване на интерфейси не може да се зареди."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Грешка: файлът не съдържа настройки в правилен формат JSON"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Потребителският интерфейс за обединена връзка не може да се зареди."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Обединена връзка %d"
@@ -3636,11 +4042,11 @@ msgstr "Обединена връзка %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Порт за обединена връзка"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr ""
 "Потребителският интерфейс за порта за обединена връзка не може да се зареди."
@@ -3648,59 +4054,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (през „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Няма връзка към мрежа"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 "Потребителският интерфейс за виртуална локална мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Връзка към VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Потребителският интерфейс за ВЧМ не може да се зареди."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Не може да се намери приставка за ВЧМ за „%s“."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не може да се намери приставка за ВЧМ за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Неуспешно установяване на връзка"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Потребителският интерфейс за ВЧМ не може да се зареди."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Не може да се намери приставка за ВЧМ за „%s“."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Връзка към ВЧМ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Изберете вид ВЧМ"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3711,7 +4117,7 @@ msgstr ""
 "видът, който искате да ползвате го няма в списъка, ще трябва да инсталирате "
 "съответната приставка за ВЧМ."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3720,7 +4126,7 @@ msgstr ""
 "Тази опция заделя връзката за ползване само с безжичната точка за достъп с "
 "указания тук хардуерен адрес (BSSID). Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3731,96 +4137,94 @@ msgstr ""
 "мрежовото устройство с указания тук постоянен хардуерен адрес. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Потребителският интерфейс за безжична мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Което и да е устройство"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Безжична връзка %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128 битов ключ за WEP (шестнадесетичен или ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "128 битова парола за WEP"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Частна WPA & WPA2 "
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Корпоративна WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"Потребителският интерфейс за сигурност на Wi-Fi не може да се зареди. Липсват "
-"настройките за Wi-Fi."
+"Потребителският интерфейс за сигурност на Wi-Fi не може да се зареди. "
+"Липсват настройките за Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Защита на безжична мрежа"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Потребителският интерфейс за сигурност на Wi-Fi не може да се зареди."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Вече съществува файл с името „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Замяна"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Искате ли да замените „%s“ с връзката към ВЧМ, която запазвате?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Връзка по ВЧМ не може да бъде изнесена"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3831,222 +4235,106 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Изнасяне на връзка към ВЧМ…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Отключване"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Автоматично отключване на това устройство"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Информация за връзката"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Активни мрежови връзки"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Избор на ваш, личен сертификат…"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Частен _ключ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Парола за _частен ключ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Избор на ваш, личен сертификат…"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Потребителски сертификат:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Мобилната ви връзка е настроена по следния начин:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Устройството ви:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Доставчикът ви:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Планът ви:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Сега ще се осъществи връзка към вашия доставчик с настройките, които сте "
-"задали. Ако свързването е неуспешно или нямате достъп до мрежови ресурси, "
-"проверете отново вашите настройки. За да промените вашите настройки, "
-"изберете „Мрежови връзки“ от менюто „Система“ → „Предпочитания“."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Потвърждение на настройки на мобилна връзка"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Моята държава не е в списъка"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не е в списъка"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Изберете вашия план"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_Име на точка за достъп за избрания план (APN):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Предупреждение: Избирането на неправилен план може да създаде проблеми при "
-"отчитането на вашата сметка или да нямате връзка.\n"
-"\n"
-"Ако не сте сигурни за вашия план, попитайте вашия доставчик за името на "
-"точката за достъп (APN)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Избор на вашия план за плащане"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Планът не е в списъка…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Изберете вашия доставчик от _списък:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Доставчик"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Доставчик:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr ""
-"Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Доставчикът използва технология чрез CDMA (като 1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Изберете вашия доставчик"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Списък с държави или региони:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Държава или регион"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Моята държава не е в списъка"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Изберете държавата на вашия доставчик"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталирано устройство за GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталирано устройство за CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Което и да е устройство"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна връзка"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4054,189 +4342,268 @@ msgstr ""
 "Този помощник ще ви помогне по-лесно да настроите връзка към мобилна (3G) "
 "мрежа."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Ще ви е нужна следната информация:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Името на вашия доставчик"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Името на вашия план за плащане"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "Име на точка за достъп на вашия план за плащане — APN (в някои случаи)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Създаване на връзка за _това устройство:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Което и да е устройство"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройване на мобилна връзка"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Нова мобилна връзка"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Държава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изберете държавата на вашия доставчик"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Изберете вашия доставчик от _списък:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Доставчикът използва технология чрез CDMA (като 1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Изберете вашия доставчик"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Изберете вашия план"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_Име на точка за достъп за избрания план (APN):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Предупреждение: Избирането на неправилен план може да създаде проблеми при "
+"отчитането на вашата сметка или да нямате връзка.\n"
+"\n"
+"Ако не сте сигурни за вашия план, попитайте вашия доставчик за името на "
+"точката за достъп (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Избор на вашия план за плащане"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Мобилната ви връзка е настроена по следния начин:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Устройството ви:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Доставчикът ви:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Планът ви:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Сега ще се осъществи връзка към вашия доставчик с настройките, които сте "
+"задали. Ако свързването е неуспешно или нямате достъп до мрежови ресурси, "
+"проверете отново вашите настройки. За да промените вашите настройки, "
+"изберете „Мрежови връзки“ от менюто „Система“ → „Предпочитания“."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потвърждение на настройки на мобилна връзка"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(нищо)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "С_ертификат на CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Неопределена"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Избор на ваш, личен сертификат…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Потребителски сертификат:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Грешка при редактиране на връзката"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Отключване"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "_Само този потребител да ползва паролата"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "_Всички потребители да ползват паролата"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "П_итане всеки път за паролата"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "За свързване към „%s“ се изисква парола."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Втора парола:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Пока_зване на паролите"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Втора парола:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Пока_зване на паролите"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Втора парола:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Парола:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr " Прекъсване"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Създаване"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4244,35 +4611,35 @@ msgstr ""
 "За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани "
 "ключове."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Въведете име на безжичната мрежа, която искате да създадете."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Свързване към скрита безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Скрита безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4280,35 +4647,55 @@ msgstr ""
 "Въведете име и данни за сигурност на скритата безжична мрежа, към която "
 "искате да се свържете."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Защита на безжична мрежа:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Вр_ъзка:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Безжична _карта:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Доставчикът не е в списъка, _ръчно въвеждане:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Доставчик:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Списък с държави или региони:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Държава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Жична мрежа"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Мрежа на OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4318,17 +4705,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Защита на безжична мрежа:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Име на мрежа:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Вр_ъзка:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Безжична _карта:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Употреба:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4336,7 +4745,7 @@ msgstr ""
 "Тази програма е компонент на NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4344,413 +4753,481 @@ msgstr ""
 "Не е предназначена за работа през конзолата, а се изпълнява в графичната "
 "среда GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "не е включено"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не е регистрирана"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Домашна мрежа"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "търсене"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрацията е отхвърлена"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (роуминг към %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Мрежа с роуминг (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Мрежа с роуминг"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "ПИН за картата „%s“ на „%s“"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Необходим е PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Мобилното устройство изисква PIN"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Мобилната връзка „%s“ е активна: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Връзка към %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Сертификати, DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "Частни ключове, формат DER, PEM или PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Избор на файл за PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Файлове за PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимен"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Идентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "И двете"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Анони_мна идентичност:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_Файл за PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "В_ътрешна идентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Автоматично снабдяване с PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Избор на сертификат от сертифициращ орган…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Версия 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "С_ертификат на CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Версия на _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "128 битова парола за WEP"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Пока_зване на паролите"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_Не е необходим сертификат от сертифициращ орган"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "_Не е необходим сертификат от сертифициращ орган"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "И_дентичност:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Тунелен TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Защитен EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Идентификация:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (стандартно)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Открита система"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Споделен ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (стандартно)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ключ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Пок_азване на ключа"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Индек_с в WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Вид:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (стандартно)"
+
+#~ msgid "Ignored"
+#~ msgstr "Игнорирана"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Неуспешно обновяване на тайните на мрежовата връзка поради непозната "
+#~ "грешка."
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Автоматично свързване към тази мрежа"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Информация за връзката"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Връзка към ВЧМ не може да бъде внесена"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Файлът „%s“ не може да се прочете или не съдържа данни за връзка към ВЧМ\n"
+#~ "\n"
+#~ "Грешка: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Непозната грешка"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Избор на сертификат от сертифициращ орган…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "С_ертификат на CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Аплетът NetworkManager"
@@ -4784,30 +5261,6 @@ msgstr "_Вид:"
 #~ 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"
 
@@ -5035,12 +5488,6 @@ msgstr "_Вид:"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "Свойството „%s“ / „%s“ е неправилно: %d"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Потребителският интерфейс за WiMAX не може да се зареди."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Връзка по WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5064,9 +5511,6 @@ msgstr "_Вид:"
 #~ msgid "Error: %s"
 #~ msgstr "Грешка: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Не може да се създаде комутируема връзка: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Телефонът ви е готов за работа!"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 631c4b54..cf665cf8 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-12-02 01:55-0500\n"
 "Last-Translator: \n"
 "Language-Team: Bengali (India) <anubad@lists.ankur.org.in>\n"
@@ -22,41 +23,50 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "%s নেটওয়ার্ক"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "নেটওয়ার্ক সংযোগ নিয়ন্ত্রণ করুন"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
 msgstr "নেটওয়ার্ক সংযোগ"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "আপনার নেটওয়ার্ক সংযোগ বৈশিষ্ট্য সম্পাদন ও পরিবর্তন করুন"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
 "মান TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "বিচ্ছিন্ন হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -64,12 +74,12 @@ msgstr ""
 "নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
 "জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -78,11 +88,11 @@ msgstr ""
 "নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
 "জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "উপলব্ধ নেটওয়ার্কের বিজ্ঞপ্তি প্রদর্শন আড়াল করা হবে"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -90,21 +100,22 @@ msgstr ""
 "বেতার নেটওয়ার্ক উপলব্ধ থাকলে বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
 "TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "স্ট্যাম্প"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "নতুন সংস্করণের মধ্যে বৈশিষ্ট্য মাইগ্রেট করা হবে কি না নির্ধারণ করতে এটি ব্যবহার করা "
 "হয়।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "ওয়াই-ফাই নির্মাণ নিষ্ক্রিয় করুন"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -112,162 +123,175 @@ msgstr ""
 "এই অ্যাপ্লেট সহযোগে অ্যাড-হক নেটওয়ার্ক নির্মাণের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
 "TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "CA সার্টিফিকেট: (_A)"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "নেটওয়ার্ক ম্যানেজার"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager অ্যাপ্লেট"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "তারযুক্ত 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "সংযোগ করুন (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "নেটওয়ার্কের নাম: (_N)"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "অ্যাড-হক"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "অজানা"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "এই বার্তা পুনরায় প্রদর্শন করা হবে না"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে।"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "\n"
 "নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "VPN পরিসেবা অপ্রত্যাশিতভাবে বন্ধ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +330,7 @@ msgstr ""
 "\n"
 "VPN পরিসেবা থেকে অবৈধ কনফিগারেশন প্রাপ্ত হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +339,7 @@ msgstr ""
 "\n"
 "সংযোগের সময়সীমা উত্তীর্ণ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "\n"
 "যথাযত সময়ে VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +357,7 @@ msgstr ""
 "\n"
 "VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -342,7 +366,7 @@ msgstr ""
 "\n"
 "VPN-র বৈধ গোপনীয় তথ্য উপস্থিত না থাকার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -351,7 +375,7 @@ msgstr ""
 "\n"
 "VPN-র অবৈধ গোপন তথ্যের ফলে '%s' VPN সংযোগ বিফল হয়েছে।"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -360,7 +384,7 @@ msgstr ""
 "\n"
 "'%s' VPN সংযোগ বিফল।"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -368,19 +392,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN লগ-ইনের বার্তা"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN সংযোগ বিফল"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -392,7 +416,7 @@ msgstr ""
 "VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -405,598 +429,629 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ডিভাইস প্রস্তুত নয় (ফার্মওয়্যার অনুপস্থিত)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ডিভাইস প্রস্তুত নয়"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ডিভাইস পরিচালিত নয়"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "কোনো নেটওয়ার্ক ডিভাইস উপলব্ধ নয়"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN সংযোগ (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN কনফিগার করুন...(_C)"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN সংযোগ (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager বর্তমানে চলছে না..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "নেটওয়ার্ক ব্যবস্থা নিষ্ক্রিয় অবস্থায় রয়েছে"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "বেতার সক্রিয় করুন (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "মোবাইল ব্রড-ব্যান্ড সক্রিয় করুন (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "বিজ্ঞপ্তি প্রদানের ব্যবস্থা সক্রিয় করুন (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "সংযোগ সংক্রান্ত তথ্য (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "সংযোগ সম্পাদনা..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "পরিচিতি (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "আপনি এখন '%s'-র সাথে সংযুক্ত।"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "নেটওয়ার্কের সংযোগ বিচ্ছিন্ন করা হয়েছে।"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "'%s' নেটওয়ার্ক সংযোগ প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "'%s' নেটওয়ার্ক সংযোগের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s'-র জন্য নেটওয়ার্ক ঠিকানা অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "'%s' নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "'%s' VPN সংযোগ আরম্ভ করা হচ্ছে..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "'%s' VPN সংযোগের জন্য ব্যবহারকারী অনুমোদিত হওয় আবশ্যক..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s'-র জন্য VPN ঠিকানার অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "'%s' VPN সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager অ্যাপ্লেট"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ভুল PUK কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ভুল PIN কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "আন-লক করার কোড পাঠানো হচ্ছে..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "মোবাইল ব্রড-ব্যান্ড (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "মোবাইল ব্রড-ব্যান্ড"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "উপলব্ধ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "আপনি এখন মোবাইল ব্রড-ব্যান্ড নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "মোবাইল ব্রডব্যান্ড নেটওয়ার্ক পাসওয়ার্ড"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "অাপনি এখন বন্ডেড নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "অাপনি এখন ব্রিজড নেটওয়ার্কের সাথে সংযুক্ত"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "আপনি এখন মোবাইল ব্রড-ব্যান্ড নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ '%s' কে প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "'%s' ব্রড-ব্যান্ড সংযোগ কনফিগার করা হচ্ছে..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগের ক্ষেত্রে ব্যবহারকারীর অনুমোদন প্রয়োজন..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "স্বয়ংক্রিয় ইথারনেট"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "বর্তমানে তারযুক্ত নেটওয়ার্কের সাথে সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s', প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' কনফিগার করা হচ্ছে..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s'-র ক্ষেত্রে অনুমোদিত হওয়া আবশ্যক..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s'-র জন্য তারযুক্ত নেটওয়ার্কের ঠিকানা প্রাপ্তির অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL অনুমোদন"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(শূণ্য)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "নতুন সংযোগ নির্মাণ করা সম্ভব হয়নি"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "তারযুক্ত নেটওয়ার্ক"
 msgstr[1] "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "বেতার নিষ্ক্রিয় করা হয়েছে"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "অতিরিক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "বেতার নেটওয়ার্ক উপলব্ধ রয়েছে"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপনের জন্য এই আইকনের উপর ক্লিক করুন"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "অাপনি এখন '%s' Wi-Fi নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "'%s' নেটওয়ার্ক সংযোগ প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' কনফিগার করা হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "'%s' বেতার নেটওয়ার্কের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s'-র জন্য নেটওয়ার্ক ঠিকানা অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "সংযোগ সংক্রান্ত তথ্য প্রদর্শন করতে সমস্যা:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ডাইনামিক WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "শূণ্য"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "ডিফল্ট"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u মেগাবাইট/সেকেন্ড"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 #, fuzzy
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "অজানা"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 #, fuzzy
 msgctxt "Address"
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ঠিকানা"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ব্রডকাস্টের ঠিকানা"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 #, fuzzy
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "সাবনেট মাস্ক"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "প্রধান DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "দ্বিতীয় DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "তৃতীয় DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ইথারনেট (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 ওয়াই-ফাই (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ইন্টারফেস"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "হার্ডওয়্যারের ঠিকানা"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ড্রাইভার"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "গতি"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "নিরাপত্তা:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "ডিফল্ট রুট"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "উপেক্ষা করা হয়েছে"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "পাসওয়ার্ড:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "ধরন: (_T)"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "গেটওয়ে"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "ব্যবহারকারীর নাম: (_U)"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "সংযোগ: (_n)"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "অজানা"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "কোনো বৈধ সক্রিয় সংযোগ সনাক্ত করা যায়নি!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "কপিরাইট © 2004-2012 Red Hat, Inc.\n"
 "কপিরাইট © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "নেটওয়ার্ক ডিভাইস ও সংযোগ পরিচালনার জন্য ব্যবহারযোগ্য বিজ্ঞপ্তিস্থলের অ্যাপ্লেট।"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager ওয়েব-সাইট"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"সঙ্কর্ষণ মুখোপাধ্যায়\n"
+"রুণা ভট্টাচার্য্য"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -1005,33 +1060,33 @@ msgstr ""
 "NetworkManager অ্যাপ্লেট দ্বারা কয়েকটি আবশ্যক রিসোর্সের উপস্থিতি সন্ধান করা সম্ভব "
 "হয়নি (যেমন glade ফাইল পাওয়া যায়নি)।"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "অনুপস্থিত রিসোর্স"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "মোবাইল ব্রডব্যান্ড নেটওয়ার্ক পাসওয়ার্ড"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'-র সাথে সংযোগ স্থাপন করার জন্য পাসওয়ার্ড লেখা আবশ্যক।"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN আন-লক করা প্রয়োজন"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN আন-লক করা প্রয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1041,27 +1096,27 @@ msgstr ""
 "আবশ্যক।"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 #, fuzzy
 msgid "PIN code:"
 msgstr "PIN কোড:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 #, fuzzy
 msgid "Show PIN code"
 msgstr "PIN কোড প্রদর্শন:"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK আন-লক করা প্রয়োজন"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK আন-লক করা প্রয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1071,39 +1126,46 @@ msgstr ""
 "আবশ্যক।"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 #, fuzzy
 msgid "PUK code:"
 msgstr "PUK কোড:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 #, fuzzy
 msgid "New PIN code:"
 msgstr "নতুন PIN কোড:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 #, fuzzy
 msgid "Re-enter new PIN code:"
 msgstr "নতুন PIN কোড পুনরায় লিখুন:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 #, fuzzy
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "সংযোগ সংক্রান্ত তথ্য"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1112,60 +1174,60 @@ msgstr ""
 "নেটওয়ার্কের মধ্যে উপস্থিত বিভিন্ন কম্পিউটার সনাক্ত করার জন্য IP ঠিকানা প্রয়োগ করা "
 "হয়। IP ঠিকানা যোগ করার জন্য \"যোগ করুন\" শীর্ষক বাটনটি ক্লিক করুন।"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "মুছে ফেলুন (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "স্বয়ংক্রিয়ভাবে প্রাপ্ত রুট অগ্রাহ্য করা হবে (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 "শুধুমাত্র এই নেটওয়ার্কের মধ্যে উপস্থিত রিসোর্সের জন্য এই সংযোগ ব্যবহার করা হবে (_o)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "সক্রিয় করা হলে, এই সংযোগটি কখনো ডিফল্ট নেটওয়ার্ক সংযোগ রূপে ব্যবহার করা যাবে না।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "নির্মান করুন (_r)"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "নতুন সংযোগ তৈরি করুন"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1173,85 +1235,100 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "পরিসেবা: (_S)"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "রাউন্ড-রবিন"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "সক্রিয় ব্যাকআপ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ব্রডকাস্ট"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "অ্যাডাপটিভ ট্র্যান্সমিট লোড ব্যালেন্সিং"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "অ্যাডাপটিভ লোড ব্যালেন্সিং"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (প্রস্তাবিত)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "মোড: (_o)"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "সম্পাদনা (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "নিয়ন্ত্রণ প্রাবল্যতা (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "মিলিসেকেন্ড"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ইন্টারফেসের নাম (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "লিঙ্ক নিয়ন্ত্রণ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP টার্গেট (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1259,128 +1336,180 @@ msgstr ""
 "একটি IP ঠিকানা, বা IP ঠিকানাগুলির একটি কমা দ্বারা পৃথক করা তালিকা, লিঙ্ক স্ট্যাটাস "
 "যাচাই করার সময়ে খুঁজতে হয়।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "লিঙ্ক অাপ বিলম্ব (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "প্রধান DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "বাইট"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
-msgid "_Hairpin mode:"
+msgid "_Hairpin mode"
 msgstr "পরিবহন মোড (_T):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
-msgid "_Forward delay:"
+msgid "_Forward delay"
 msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 #, fuzzy
 msgid "s"
 msgstr "মিলিসেকেন্ড"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "স্বয়ংক্রিয়"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "ডিফল্ট"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1391,435 +1520,529 @@ msgstr ""
 "ঠিকানাটি প্রয়োগ করা হবে। এই বৈশিষ্ট্যটি MAC ক্লোনিং অথবা স্পুফিং নামে পরিচিত।  "
 "উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ঠিকানা"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ঠিকানা"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ইন্টারফেসের নাম (_n):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "হার্ডওয়্যারের ঠিকানা:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "যে কোনো ডিভাইস"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "অজানা ত্রুটির কারণে সংযোগ সংক্রান্ত গোপনীয় তথ্য আপডেট করতে ব্যর্থ।"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "এই সংযোগের জন্য 802.1X নিরাপত্তা ব্যবহার করা হবে"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ব্যবহারকারীর নাম: (_U)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "পরিসেবা: (_S)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "পাসওয়ার্ড: (_P)"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ইন্টারফেস"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "প্রধান ইন্টারফেস (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "প্রধান ইন্টারফেস (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "স্বয়ংক্রিয়"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ট্যুইসটেড পেয়ার (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "অ্যাটাচমেন্ট ইউনিট ইন্টারফেস (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "মিডিয়া ইন্ডিপেনডেন্ট ইন্টারফেস (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 গিগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 গিগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "উপেক্ষা করা হবে"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ব্যবহারকারী দ্বারা নির্ধারিত"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "পোর্ট: (_P)"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "পরিসেবা: (_S)"
+msgid "_Port"
+msgstr "পোর্ট: (_P)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "ডিফল্ট"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "উপেক্ষা করা হবে"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ব্রডকাস্ট"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "গতি: (_S)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "সম্পূর্ণ ডুপ্লে (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "শূণ্য"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "বর্তমানে তারযুক্ত নেটওয়ার্কের সাথে সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "সংযোগ সংক্রান্ত তথ্য (_I)"
+msgid "_Metered connection"
+msgstr "বন্ডেড সংযোগ (_c):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "সয়ংক্রিয়ভাবে সংযোগ করা হবে (_a)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1828,7 +2051,7 @@ msgstr ""
 "নেটওয়ার্কের মধ্যে উপস্থিত বিভিন্ন কম্পিউটার সনাক্ত করার জন্য IP ঠিকানা প্রয়োগ করা "
 "হয়। IP ঠিকানা যোগ করার জন্য \"যোগ করুন\" শীর্ষক বাটনটি ক্লিক করুন।"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1836,129 +2059,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "স্বয়ংক্রিয়, শুধুমাত্র ঠিকানা"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "ঠিকানা"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "পরিবহন মোড (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ডেটাগ্রাম"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "সংযুক্ত"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "পরিবহন মোড (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ডিভাইস নাম + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ইথারনেট (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "মোড (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "ম্যানুয়াল DNS সেটিঙের সাথে স্বয়ংক্রিয়"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "লিঙ্ক-লোকাল"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "অন্যান্য কম্পিউটারের সাথে যৌথরূপে ব্যবহৃত"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "পদ্ধতি: (_M)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1969,8 +2196,8 @@ msgstr ""
 "কনফিগারেশন নির্ধারণ করতে পারবেন।  DHCP ক্লায়েন্ট আইডেন্টিফায়ার ব্যবহার করতে ইচ্ছুক "
 "হলে তা এইখানের লিখুন।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1978,26 +2205,26 @@ msgstr ""
 "হোস্ট নেম মীমাংসা করার জন্য ব্যবহৃত ডোমেইন। একাধিক ডোমেইন চিহ্নিত করার সময় কমা "
 "চিহ্ন প্রয়োগ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP ক্লায়েন্টের ID: (_H)"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "অনুসন্ধানের ডোমেইন: (_S)"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS সার্ভার: (_D)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2005,12 +2232,12 @@ msgstr ""
 "হোস্ট নেম মীমাংসা করার জন্য ব্যবহৃত ডোমেইন নেম সার্ভারের IP ঠিকানা। একাধিক ডোমেইন "
 "নেম সার্ভারের ঠিকানা চিহ্নিত করার সময় কমা চিহ্ন প্রয়োগ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "এই সংযোগটি সম্পূর্ণ করার জন্য IPv4 ঠিকানা প্রয়োজন"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2018,25 +2245,34 @@ msgstr ""
 "IPv6-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv4 কনফিগারেশন বিফল হলেও "
 "যদি IPv6 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "নিষ্ক্রিয়"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2046,16 +2282,20 @@ msgstr ""
 "হোস্ট নেম মীমাংসা করার জন্য ব্যবহৃত ডোমেইন নেম সার্ভারের IP ঠিকানা। একাধিক ডোমেইন "
 "নেম সার্ভারের ঠিকানা চিহ্নিত করার সময় কমা চিহ্ন প্রয়োগ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "এই সংযোগটি সম্পূর্ণ করার জন্য IPv6 ঠিকানা প্রয়োজন"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2063,764 +2303,866 @@ msgstr ""
 "IPv4-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv6 কনফিগারেশন বিফল হলেও "
 "যদি IPv4 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "মেট্রিক"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "সংখ্যা: (_m)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 #, fuzzy
 msgid "Advanced"
 msgstr "<b>উন্নত বৈশিষ্ট্য</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "নেটওয়ার্কের ID: (_e)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "পরিবর্তন করুন..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "প্রধান নেটওয়ার্ক উপলব্ধ না থাকলে রোমিং ব্যবহার করার অনুমতি প্রদান করা হবে"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "অনুমোদিত পদ্ধতি:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 #, fuzzy
 msgid "Configure _Methods…"
 msgstr "পদ্ধতি কনফিগার করুন (_M)&#x2026;"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "<b>কম্প্রেশন</b>"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "পয়েন্ট-টু-পয়েন্ট এনক্রিপশন (MPPE) ব্যবহার করা হবে (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128 বিট এনক্রিপশন প্রয়োজন (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "স্টেট-ফুল MPPE ব্যবহার করা হবে (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD তথ্যের কম্প্রেশনের অনুমতি প্রদান করা হবে (_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Deflate তথ্যের কম্প্রেশনের অনুমতি প্রদান করা হবে (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP হেডার কম্প্রেশন ব্যবহার করা হবে (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP ইকো প্যাকেট প্ররণ করা হবে (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "পদ্ধতি: (_M)"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "শূণ্য"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "পদ্ধতি: (_M)"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "<b>উন্নত বৈশিষ্ট্য</b>"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "নিরাপত্তা: (_S)"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "ব্যক্তিগত-কি: (_k)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "লিঙ্ক অাপ বিলম্ব (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "প্রধান ইন্টারফেস (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP টার্গেট (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP টার্গেট (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ইথারনেট (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "স্বয়ংক্রিয় ইথারনেট"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 #, fuzzy
 msgid "Any L3 protocol"
 msgstr "WPA প্রোটোকল:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 #, fuzzy
 msgid "Any L4 protocol"
 msgstr "WPA প্রোটোকল:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "হার্ডওয়্যারের ঠিকানা:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "হার্ডওয়্যারের ঠিকানা:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "পরিবহণের ক্ষমতা: (_w)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "পরিবহণের ক্ষমতা: (_w)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "প্রধান ইন্টারফেস (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ইন্টারফেসের নাম (_n):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN অাইডি (_i):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ডিভাইস নাম + সংখ্যা"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "নিরাপত্তা:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "অ্যাড-হক"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "পরিবহণের ক্ষমতা: (_w)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "গতি: (_R)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "চ্যানেল: (_h)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ব্যান্ড: (_d)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "<b>অনুমোদনের বৈধ পদ্ধতি</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "এক্সটেনসিবল অথেনটিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "পাসওয়ার্ড অথেন্টিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল সংস্করণ ২"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2830,446 +3172,484 @@ msgstr ""
 "সমর্থিত হবে। সংযোগ স্থাপনে সমস্যা হলে, কয়েকটি অনুমোদন পদ্ধতির সমর্থন ব্যবস্থা "
 "নিষ্ক্রিয় করুন।</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "বন্ড"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ব্রিজ"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN প্লাগ-ইন দ্বারা সঠিকভাবে VPN সংযোগ ইম্পোর্ট করা সম্ভব হয়নি\n"
-"\n"
-"ত্রুটি: কোনো VPN পরিসেবার ধরন উপলব্ধ নয়।"
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN সংযোগ ইম্পোর্ট করতে ব্যর্থ"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"'%s' ফাইল পড়া যায়নি অথবা ফাইলটির মধ্যে কোনো পরিচিত VPN সংযোগের তথ্য উপস্থিত "
-"নেই\n"
+"VPN প্লাগ-ইন দ্বারা সঠিকভাবে VPN সংযোগ ইম্পোর্ট করা সম্ভব হয়নি\n"
 "\n"
-"ত্রুটি: %s।"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "অজানা"
+"ত্রুটি: কোনো VPN পরিসেবার ধরন উপলব্ধ নয়।"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ইম্পোর্ট করার উদ্দেশ্যে ফাইল নির্বাচন করুন"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "ভার্চুয়াল"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "অজানা কারণে সংযোগ সম্পাদনা ব্যবস্থার ডায়লগ আরম্ভ করা যায়নি।"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "নতুন সংযোগ নির্মাণ করা সম্ভব হয়নি"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "সংযোগ মুছে ফেলতে ব্যর্থ"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "আপনি কি নিশ্চিতরূপে %s সংযোগটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN সংযোগ (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ঠিকানা"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "নেটমাস্ক"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "গেটওয়ে"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "মেট্রিক"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "প্রেফিক্স"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s সম্পাদনা"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "নামবিহীন সংযোগ সম্পাদনা"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "সংযোগের নাম (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "সম্পাদন ব্যবস্থা আরম্ভ করতে ত্রুটি"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "সংযোগ অাপডেট ব্যর্থ হয়েছে"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "সংযোগ সম্পাদন কয়েকটি আবশ্যক রিসোর্স খুঁজে পায়নি (.ui ফাইল পাওয়া যায়নি)।"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "এই সংযোগের ক্ষেত্রে করা পরিবর্তনগুলি সংরক্ষণ করুন।"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "এই মেশিনের সকল ব্যবহারকারীর জন্য এই সংযোগ সংরক্ষণ করার জন্য অনুমোদন করুন।"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "সংযোগ সম্পাদনা করা সম্ভব হয়নি"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "সংযোগ সম্পাদক ডায়লগ প্রস্তুত করতে অজানা সমস্যা দেখা দিয়েছে।"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "সম্পাদন ব্যবস্থা আরম্ভ করতে ত্রুটি"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "সংযোগের নাম (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "রপ্তানি করুন (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "লেবেল"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "লেবেল"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "কখনো নয়"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "এখন"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট পূর্বে"
 msgstr[1] "%d মিনিট পূর্বে"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন্টা পূর্বে"
 msgstr[1] "%d ঘন্টা পূর্বে"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন পূর্বে"
 msgstr[1] "%d দিন পূর্বে"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাস পূর্বে"
 msgstr[1] "%d মাস পূর্বে"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d বৎসর পূর্বে"
 msgstr[1] "%d বৎসর পূর্বে"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "সংযোগ অাপডেট ব্যর্থ হয়েছে"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "তার সংযোগ %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "তার সংযোগ %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "নাম"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "সর্বশেষ ব্যবহার"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "নির্বাচিত সংযোগটি সম্পাদনা করুন"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "নির্বাচিত সংযোগ সম্পাদনা করার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "নির্বাচিত সংযোগটি মুছে ফেলুন"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "নির্বাচিত সংযোগটি মুছে ফেলার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগের ধরন সমর্থিত নয়।"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "সংযোগ অাপডেট ব্যর্থ হয়েছে"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "নেটওয়ার্ক সংযোগ"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN সংযোগ (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X নিরাপত্তা"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "এই সংযোগের জন্য 802.1X নিরাপত্তা ব্যবহার করা হবে"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ব্লু-টুথ ডিভাইস পাওয়া যায়নি।"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "বন্ড সংযোগ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 #, fuzzy
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "অাপনি যে ধরনের সংযোগ তৈরি করতে চান তা নির্বাচন করুন:"
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "বেতার নেটওয়ার্ক"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "প্রধান DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "বন্ড সংযোগ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "বন্ড সংযোগ %d"
@@ -3277,35 +3657,40 @@ msgstr "বন্ড সংযোগ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 #, fuzzy
 msgid "Bridge Port"
 msgstr "ব্রিজ"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL-র ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL-র ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "প্রধান ইন্টারফেস (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL সংযোগ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3315,57 +3700,56 @@ msgstr ""
 "এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
 "ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "উপেক্ষা করা হয়েছে"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "তারযুক্ত নেটওয়ার্কের ইউকার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ইথারনেট (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "তার সংযোগ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "ডিফল্ট"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3376,185 +3760,187 @@ msgstr ""
 "এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
 "ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand সংযোগ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "তার সংযোগ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "স্বয়ংক্রিয় (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (VPN) ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "স্বয়ংক্রিয়, শুধুমাত্র ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "স্বয়ংক্রিয় (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (PPPoE) ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "স্বয়ংক্রিয় (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (DHCP) ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "শুধুমাত্র স্থানীয় সংযোগ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "DNS সার্ভার: (_D)"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "অনুসন্ধানের ডোমেইন: (_S)"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s-র জন্য IPv4 রুট সম্পাদনা"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-র বৈশিষ্ট্য"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "স্বয়ংক্রিয়, শুধুমাত্র DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s-র জন্য IPv6 রুট সম্পাদনা"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-র বৈশিষ্ট্য"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL-র ইউজার ইন্টারফেস লোড করা যায়নি।"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL সংযোগ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s স্লেভ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "মোবাইল ব্রড-ব্যান্ড ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগের ধরন সমর্থিত নয়।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "মোবাইল ব্রড-ব্যান্ড উপলব্ধকারীর ধরন নির্বাচন করুন"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3563,7 +3949,7 @@ msgstr ""
 "মোবাইল ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারী দ্বারা ব্যবহৃত পরিসেবা নির্বাচন করুন।  এই তথ্য "
 "অজানা থাকলে, পরিসেবাকারীর সাথে যোগাযোগ করুন।"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "আপনার পরিসেবা উপলব্ধকারী দ্বারা GSM-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ GPRS, "
@@ -3571,87 +3957,83 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "আপনার পরিসেবা উপলব্ধকারী দ্বারা CDMA-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ 1xRTT, "
 "EVDO) (_C)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "শূণ্য"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s-র জন্য PPP অনুমোদন ব্যবস্থা সম্পাদনা"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-র বৈশিষ্ট্য"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "তারযুক্ত নেটওয়ার্কের ইউকার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "তার সংযোগ %d"
@@ -3659,11 +4041,11 @@ msgstr "তার সংযোগ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
@@ -3671,68 +4053,68 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "VLAN ইউজার ইন্টারফেস লোড করা যায়নি।"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s'-র জন্য VPN প্লাগ-ইন পরিসেবা পাওয়া যায়নি।"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s'-র জন্য VPN প্লাগ-ইন পরিসেবা পাওয়া যায়নি।"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ইউজার ইন্টারফেস লোড করা যায়নি।"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s'-র জন্য VPN প্লাগ-ইন পরিসেবা পাওয়া যায়নি।"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "VPN সংযোগ বিফল"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3741,7 +4123,7 @@ msgstr ""
 "এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত BSSID দ্বারা চিহ্নিত বেতার অ্যাকসেস "
 "পয়েন্টের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3751,99 +4133,97 @@ msgstr ""
 "এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
 "ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "যে কোনো ডিভাইস"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "তার সংযোগ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP ৪০/১২৮-বিট কি (Hex অথবা ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ও WPA2 এন্টারপ্রাইজ"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ; ওয়াই-ফাইল বৈশিষ্ট্য অনুপস্থিত।"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "বেতার নিরাপত্তা"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" নামক একটি ফাইল উপস্থিত।"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "প্রতিস্থাপন (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "সংরক্ষণের জন্য চিহ্নিত VPN সংযোগ সহযোগে %s-র প্রতিস্থাপন করা হবে কি?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN সংযোগ এক্সপোর্ট করা যায়নি"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3854,226 +4234,106 @@ msgstr ""
 "\n"
 "ত্রুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN সংযোগ এক্সপোর্ট করুন..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "আন-লক করুন: (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "সংযোগ সংক্রান্ত তথ্য"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "নেটওয়ার্ক সংযোগ"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "ব্যক্তিগত-কি: (_k)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "নিম্নলিখিত বৈশিষ্ট্য সহ মোবাইল ব্রড-ব্যান্ড সংযোগ কনফিগার করা হয়েছে:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "আপনার ব্যবহৃত ডিভাইস:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "পরিসেবা উপলব্ধকারী:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "আপনার ব্যবহৃত প্ল্যান:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড পরিসেবা "
-"উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা নেটওয়ার্ক রিসোর্স "
-"ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা করুন।  মোবাইল ব্রড-ব্যান্ড "
-"সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ\" "
-"নির্বাচন করুন।"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "তালিকা বহির্ভূত"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ব্যবহৃত প্ল্যান নির্বাচন করুন: (_S)"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "নির্বাচিত প্ল্যানের APN (অ্যাকসেস পয়েন্ট নেম): (_A)"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"সতর্কবার্তা: ভুল প্ল্যান নির্বাচন করা হলে আপনার ব্রড-ব্যান্ড সংযোগের বিল এবং সংযোগ "
-"স্থাপনা সংক্রান্ত সমস্যা দেখা দিতে পারে।\n"
-"\n"
-"প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ করে "
-"আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ব্যবহৃত বিল প্ল্যান নির্বাচন করুন"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ব্যবহৃত প্ল্যান তালিকায় অনুপস্থিত..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "তালিকা থেকে পরিসেবা উপলব্ধকারীর নাম নির্বাচন করুন: (_l)"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "পরিসেবা উপলব্ধকারী"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "পরিসেবা উপলব্ধকারী:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr ""
-"পরিসেবা উপলব্ধকারী দ্বারা GSM প্রযুক্তি ব্যবহার করা হয় (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "পরিসেবা উপলব্ধকারী দ্বারা CDMA প্রযুক্তি ব্যবহার করা হয় (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "পরিসেবা উপলব্ধকারী নির্বাচন করুন"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-#, fuzzy
-msgid "Country or Region List:"
-msgstr "দেশের তালিকা:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-#, fuzzy
-msgid "Country or region"
-msgstr "দেশের তালিকা:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "পরিসেবা উপলব্ধকারীর দেশ নির্বাচন করুন"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ইনস্টল করা GSM ডিভাইস"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ইনস্টল করা CDMA ডিভাইস"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "যে কোনো ডিভাইস"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4081,231 +4341,311 @@ msgstr ""
 "এই সহায়ক ব্যবস্থার সাহায্যে একটি সেলুলার (৩জি) নেটওয়ার্কের সাথে মোবাইল ব্রড-ব্যান্ড "
 "সংযোগ স্থাপন করা যাবে।"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "নিম্নলিখিত তথ্য প্রয়োজন:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারীর নাম"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ব্রড-ব্যান্ড বিলিং প্ল্যানের নাম"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(কিছু ক্ষেত্রে) আপনার ব্যবহৃত ব্রড-ব্যান্ড বিলিং প্ল্যান APN (অ্যাকসেস পয়েন্ট নেম)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "এই মোবাইল ব্রড-ব্যান্ড ডিভাইসের জন্য সংযোগ নির্মাণ করুন (_t)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "যে কোনো ডিভাইস"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ প্রস্তুত করুন"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "দেশের তালিকা:"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "পরিসেবা উপলব্ধকারীর দেশ নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "তালিকা থেকে পরিসেবা উপলব্ধকারীর নাম নির্বাচন করুন: (_l)"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"পরিসেবা উপলব্ধকারী দ্বারা GSM প্রযুক্তি ব্যবহার করা হয় (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "পরিসেবা উপলব্ধকারী দ্বারা CDMA প্রযুক্তি ব্যবহার করা হয় (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "পরিসেবা উপলব্ধকারী নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ব্যবহৃত প্ল্যান নির্বাচন করুন: (_S)"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "নির্বাচিত প্ল্যানের APN (অ্যাকসেস পয়েন্ট নেম): (_A)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"সতর্কবার্তা: ভুল প্ল্যান নির্বাচন করা হলে আপনার ব্রড-ব্যান্ড সংযোগের বিল এবং সংযোগ "
+"স্থাপনা সংক্রান্ত সমস্যা দেখা দিতে পারে।\n"
+"\n"
+"প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ করে "
+"আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ব্যবহৃত বিল প্ল্যান নির্বাচন করুন"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "নিম্নলিখিত বৈশিষ্ট্য সহ মোবাইল ব্রড-ব্যান্ড সংযোগ কনফিগার করা হয়েছে:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "আপনার ব্যবহৃত ডিভাইস:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "পরিসেবা উপলব্ধকারী:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "আপনার ব্যবহৃত প্ল্যান:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড পরিসেবা "
+"উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা নেটওয়ার্ক রিসোর্স "
+"ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা করুন।  মোবাইল ব্রড-ব্যান্ড "
+"সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ\" "
+"নির্বাচন করুন।"
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(শূণ্য)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA সার্টিফিকেট: (_A)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "অজানা"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "আন-লক করুন: (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "প্রতিবার এই পাসওয়ার্ড লেখার অনুরোধ করা হবে (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s'-র সাথে সংযোগ স্থাপন করার জন্য পাসওয়ার্ড লেখা আবশ্যক।"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "পাসওয়ার্ড: (_P)"
+msgid "Sh_ow passwords"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "পাসওয়ার্ড: (_P)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+msgid "_Secondary Password:"
+msgstr "পাসওয়ার্ড: (_P)"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "শূণ্য"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ডাইনামিক WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "নির্মান করুন (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "বেতার নেটওয়ার্ক অনুমোদন প্রয়োজন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "বেতার নেটওয়ার্কের জন্য অনুমোদন প্রয়োজন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "নতুন বেতার নেটওয়ার্ক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "নির্মাণ করার উদ্দেশ্যে চিহ্নিত বেতার নেটওয়ার্কের নাম নির্ধারণ করুন।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "গোপন বেতার নেটওয়ার্ক"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4314,38 +4654,57 @@ msgstr ""
 "সংযোগ করার উদ্দেশ্যে চিহ্নিত গোপন বেতার নেটওয়ার্কের নাম ও নিরাপত্তা বিষয়ক তথ্য "
 "লিখুন।"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "সংযোগ: (_n)"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "বেতার অ্যাডাপ্টার: (_a)"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "পরিসেবা উপলব্ধকারীর নাম অনুপস্থিত এবং আমি স্বয়ং তা লিখতে ইচ্ছুক: (_m)"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "পরিসেবা উপলব্ধকারী:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "দেশের তালিকা:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "দেশের তালিকা:"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "তারযুক্ত"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4355,17 +4714,42 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "নিরাপত্তা: (_S)"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "নেটওয়ার্কের নাম: (_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "সংযোগ: (_n)"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "বেতার অ্যাডাপ্টার: (_a)"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ব্যবহার:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 #, fuzzy
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
@@ -4373,7 +4757,7 @@ msgid ""
 msgstr ""
 "এই প্রোগ্রামটি NetworkManager-র অংশ (http://projects.gnome.org/NetworkManager)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4381,433 +4765,467 @@ msgstr ""
 "এটি কমান্ড-লাইনের মাধ্যমে ব্যবহারের উদ্দেশ্যে নির্মিত হয়নি এবং GNOME ডেস্কটপ "
 "পরিবেশের মধ্যে সঞ্চালিত হয়।"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "সক্রিয় নয়"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "নিবন্ধিত নয়"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "প্রধান নেটওয়ার্ক (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "প্রধান নেটওয়ার্ক"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "অনুসন্ধান করা হচ্ছে"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "নিবন্ধন প্রত্যাখ্যান করা হয়েছে"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s রোমিং)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (রোমিং)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "রোমিং নেটওয়ার্ক (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "রোমিং নেটওয়ার্ক"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN কোড প্রয়োজন"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইসের ক্ষেত্রে PIN কোড উল্লেখ করা আবশ্যক"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "রোমিং"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "DSL সংযোগ %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER অথবা PEM সার্টিফিকেট (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, অথবা PKCS#12 ব্যক্তিগত-কি (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "একটি PAC ফাইল বাছুন..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইল (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "সর্বধরনের ফাইল"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "নামবিহীন পরিচয়: (_m)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "নামবিহীন পরিচয়: (_m)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
-msgid "PAC _file:"
+msgid "PAC _file"
 msgstr "_PAC ফাইল:"
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "অভ্যন্তরীণ অনুমোদন: (_n)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বয়ংক্রিয় PAC বিশেষাধীকারের অনুমতি দিন (_A)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "সার্টিফিকেট অথোরিটির (CA) সার্টিফিকেট নির্বাচন করুন..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA সার্টিফিকেট: (_A)"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "PEAP-র সংস্করণ: (_P)"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "পরিচয়: (_d)"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "টানেল করা TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "প্রটেক্টেড EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr ""
-"১ (ডিফল্ট)\n"
-"২\n"
-"৩\n"
-"৪"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "উন্মুক্ত সিস্টেম\n"
 "যৌথরূপে ব্যবহৃত কি"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "উন্মুক্ত সিস্টেম\n"
 "যৌথরূপে ব্যবহৃত কি"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr ""
+"১ (ডিফল্ট)\n"
+"২\n"
+"৩\n"
+"৪"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "কি: (_K)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "কি প্রদর্শন করা হবে (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP ইন্ডেক্স: (_x)"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ধরন: (_T)"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "ডিফল্ট"
+
+#~ msgid "Ignored"
+#~ msgstr "উপেক্ষা করা হয়েছে"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "অজানা ত্রুটির কারণে সংযোগ সংক্রান্ত গোপনীয় তথ্য আপডেট করতে ব্যর্থ।"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "সংযোগ সংক্রান্ত তথ্য (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN সংযোগ ইম্পোর্ট করতে ব্যর্থ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' ফাইল পড়া যায়নি অথবা ফাইলটির মধ্যে কোনো পরিচিত VPN সংযোগের তথ্য উপস্থিত "
+#~ "নেই\n"
+#~ "\n"
+#~ "ত্রুটি: %s।"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "অজানা"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "সার্টিফিকেট অথোরিটির (CA) সার্টিফিকেট নির্বাচন করুন..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA সার্টিফিকেট: (_A)"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "নেটওয়ার্ক ম্যানেজার"
 
@@ -5000,17 +5418,6 @@ msgstr "ধরন: (_T)"
 #~ msgid "Unknown"
 #~ msgstr "অজানা"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "দ্বিতীয় DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "তৃতীয় DNS:"
-
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "সঙ্কর্ষণ মুখোপাধ্যায়\n"
-#~ "রুণা ভট্টাচার্য্য"
-
 #~ msgid "_Help"
 #~ msgstr "সাহায্য (_H)"
 
@@ -5147,9 +5554,6 @@ msgstr "ধরন: (_T)"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "'%s' / '%s' বিশিষ্টতা অবৈধ: %d"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "সয়ংক্রিয়ভাবে সংযোগ করা হবে (_a)"
-
 #~ msgid "Available to all users"
 #~ msgstr "সকল ব্যবহারকারীর জন্য উপস্থিত"
 
diff --git a/po/bs.po b/po/bs.po
index c90823d6..3229f3b7 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,8 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2015-02-27 10:25+0100\n"
 "Last-Translator: Samir Ribic <samir.ribic@etf.unsa.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -15,48 +16,57 @@ msgstr ""
 "X-Launchpad-Export-Date: 2015-02-05 06:47+0000\n"
 "X-Generator: Launchpad (build 17331)\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Mreža"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Upravljajte svojim mrežnim vezama"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Mrežne konekcije"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktivne mrežne veze"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Upravljajte i izmijenite podešavanja vaših mrežnih veza"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Isključivanje obavještenja o povezivanju"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Uključite ovu opciju da isključite obavještenja kada se povezujete na mrežu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Isključivanje obavještenja o prekidu veze"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Uključite ovu opciju da isključite obavještenja kada prekidate vezu sa "
 "mrežom."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Isključivanje VPN obavještenja"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -64,50 +74,51 @@ msgstr ""
 "Uključite ovu opciju da isključite obavještenja kada se povezujete na VPN "
 "ili kada prekidate vezu sa njim."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Isključi obavještavanja o dostupnim mrežama"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Uključite ovu opciju da isključite obavještenja o dostupnosti bežičnih mreža."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Pečat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Onemogući kreiranje bežične mreže"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Uključite ovu opciju da isključite formiranje ad-hoc mreža iz ovog "
 "programčića."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Prikaži programčić u obvještajnom području"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Postavljeno na FALSE radi onemogućivanja programčića u obavještajnom "
 "području."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Zanemari CA certifikat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -115,7 +126,7 @@ msgstr ""
 "Uključite ovu opciju da isključite upozorenja o CA certifikatima u EAP "
 "potvrđivanju identiteta."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -123,130 +134,143 @@ msgstr ""
 "Uključite ovu opciju da isključite upozorenja o CA certifikatima u drugoj "
 "fazi EAP potvrđivanja identiteta."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Programče Upravnik mreže"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Nema mrežnih veza"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Programče Upravnik mreže"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Potvrđivanje identiteta za 802.1X vezu"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "Povezan"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Ime mreže:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sigurno"
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Nisam uspio da dodam/aktiviram vezu"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Greška veze"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Neuspjelo prekidanje veze uređaja"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Neuspjelo prekidanje veze"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Neuspjelo aktiviranje veze"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -256,7 +280,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -266,7 +290,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -276,7 +300,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN "
 "servisa."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ jer je VPN servis poslao neodgovarajuća "
 "podešavanja."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer je isteklo vrijeme za povezivanje."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer VPN servis nije pokrenut na vrijeme."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zato što ne mogu da pokrenem VPN servis."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer ne postoje ispravne VPN lozinke."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neispravnih VPN lozinki."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN veza je uspješno uspostavljena.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Poruka za VPN prijavu"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Nije uspjelo povezivanje na VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -378,7 +402,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,566 +415,591 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "uređaj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "uređaj nije spreman"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "uređaj nije upravljan"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nema dostupnih mrežnih uređaja"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "V_PN veze"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "Po_desi VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "V_PN veze"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager nije pokrenut..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Umrežavanje isključeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Uključi _mrežne usluge"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Uključi _bežičnu Wi-Fi mrežu"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilne veze"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Prikaži obavještenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Izmijeni veze..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Povezani ste na „%s“."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Prekinuta veza"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Pripremam mrežnu vezu „%s“..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Potrebna je autentifikacija korisnika za uspostavljanje veze „%s“..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Zahtijevam adresu mreže za „%s“..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Mrežna veza '%s' je aktivna"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Uspostavljam VPN vezu „%s“..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 "Potrebna je autentifikacija korisnika za uspostavljanje VPN veze „%s“..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Zahtijevam VPN adresu za „%s“..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN veza '%s' je aktivna"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nema mrežnih veza"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Programče Upravnik mreže"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Pogrešan PUK kod, kontaktirajte vašeg provajdera."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Pogrešan PIN kod, kontaktirajte vašeg provajdera."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Šaljem kod za otključavanje."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna širokopojasna (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilna širokopojasna"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dostupno"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Nova mobilna, širokopojasna veza"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Veza uspostavljena"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sada ste spojeni na Mobilnu Širokopojasnu mrežu."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilna Širokopojasna mreža."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Sada ste registrovani na kućnu mrežu."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Sada ste registrovani na mrežu prebacivanja."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Povezani ste mobilnom širokopojasnom mrežom."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Pripremam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Podešavam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Potrebna je autentifikacija korisnika za mobilnu širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobilna širokopojasna veza '%s' je aktivna"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatska žičana veza"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet mreže (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet mreža (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet mreže"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet mreža"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Konektovani ste na ethernet mrežu."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Pripremam vezu preko Ethernet mreže „%s“..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Podešavam vezu preko Ethernet mreže „%s“..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Potrebna je prijava korisnika za uspostavljanje Ethernet mrežne veze „%s“..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Zahtijevam adresu za Ethernet mrežu „%s“..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Povezani ste preko Ethernet mrežne veze „%s“"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikacija"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Kreirajte Novu Wi-Fi Mrežu"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Nisam uspio da dodam novu vezu"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bežične Wi-Fi mreže (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bežična Wi-Fi mreža (%s)"
 
 #         translations.
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Bežična Wi-Fi mreža"
 msgstr[1] "Bežične Wi-Fi mreže"
 msgstr[2] "Bežične Wi-Fi mreže"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Bežična Wi-Fi mreža je isključena"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Bežična Wi-Fi mreža je isključena fizičkim prekidačem"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Još mreža"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupne su bežičneWi-Fi  mreže"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Koristite meni mreže da se povežete na bežičnu Wi-Fi mrežu"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Konektovani ste na Wi-Fi mrežu '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Pripremam bežičnu Wi-Fi mrežnu vezu „%s“..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Podešavam vezu preko bežične Wi-Fi mreže „%s“..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Potrebna je prijava korisnika za uspostavljanje bežične vWi-Fi jeze „%s“..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Zahtijevam adresu bežične Wi-Fi mreže za „%s“..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Povezani ste preko bežične Wi-Fi veze „%s“ : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Povezani ste preko bežične Wi-Fi veze „%s“"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Nisam uspio da aktiviram vezu"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamički WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adrese"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (osnovno)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznata"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresa za emitovanje"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mrežna maska"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primarno:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Sekundarna lozinka:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eternet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Sprega"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardverska adresa"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drajver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Brzina"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sigurnost:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Podrazumijevana ruta"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorisan"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN Tip"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN Izlaz"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN Korisnik"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN Banner"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Bazna konekcija"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nisu pronađene važeće aktivne veze!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -958,17 +1007,21 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "i mnoge druge saradnici i prevodioci iz zajednice"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Programče za obavještajnu zonu za upravljanje mrežnim uređajima i vezama."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Veb sajt MrežnogMenadžera"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -976,33 +1029,33 @@ msgstr ""
 "NetvorkManager Aplet ne može da pronađe neke potrebne resurse (.ui datoteka "
 "nije pronađena)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Nedostajući resursi"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne, širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otključati SIM PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Potrebno je otključati SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1010,25 +1063,25 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahtijeva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kod:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Pokaži PIN kod"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otključati SIM PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Potrebno je otključati SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1036,35 +1089,42 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahtijeva SIM PUK kod."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kod:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Novi PIN kod:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite novi PIN kod:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kodove."
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Podaci o vezi"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Nisam uspio da aktiviram vezu"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1073,41 +1133,41 @@ msgstr ""
 "IP adrese identifikuju vaš računar na mreži.  Kliknite na dugme „Dodaj“ da "
 "biste dodali IP adresu."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Zanemari automatski dobijene puteve"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Koristi ovu vezu samo za resurse na sopstvenoj mreži"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1115,16 +1175,16 @@ msgstr ""
 "Ukoliko je omogućeno, ova veza nikada neće biti korištena kao "
 "podrazumijevana."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Napravi…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Izaberite vrstu veze"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1136,85 +1196,100 @@ msgstr ""
 "Ako pravite VPN vezu, a ista se ne pojavljuje na spisku, možda nemate "
 "instaliran ispravan VPN priključak."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Usluga:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Kružno raspoređivanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktivna kopija"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Emitovanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Balansiranje prilagodljivog prijenosa opterećenja"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Balansiranje prilagodljivog opterećenja"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (preporučeno)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Vezane _veze:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Režim:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Praćenja _frekvencija:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Ime interfejsa:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Link Praćenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _ciljevi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1222,19 +1297,22 @@ msgstr ""
 "IP adresu, ili listu zarezom-odvojenih IP adresa, tražiti kod provjere "
 "statusa veze."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Link _up kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Link _dolje kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primarno:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1242,105 +1320,163 @@ msgstr ""
 "Naziv sučelja primarnog uređaja. Ako je postavljen, ovaj uređaj će uvijek "
 "biti aktivan kao uređaj nižeg prioriteta kada je na raspolaganju."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajtova"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Put _trošak:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Ukosnica način:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Premoštene _konekcije:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Naprijed kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Zdravo vrijeme:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Uključi _mrežne usluge"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Omogućiti _STP (Razgranalog Drvo Protokola)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Maksimum starost:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Vrijeme starenja:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatska"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "podrazumijevano"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Omogući"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1351,195 +1487,236 @@ msgstr ""
 "uređaja na kojem se ova konekcija uspostavlja. Ova osobina je poznata pod "
 "kao kloniranje MAC adrese. Primjer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Ime VLAN interfejsa:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardverska adresa:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Bilo koji uređaj"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Ažuriranje tajni veze nije uspjelo zbog nepoznate greške."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Koristi Data Center Bridging (DCB) za ovu konekciju"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Kontrola protoka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Odlika"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Omogući"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Reklamiraj"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Spreman"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Opcije..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioritetne grupe"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Vlakno"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioritetna kontrola protoka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Omogućite ili onemogućite prvenstvo prijenosa pauze za svakog Korisnika "
 "Prioriteta."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioritet:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Promet Klase:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Stroga Bandwidth:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Bandwidth prioritet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Bandwidth grupa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ID grupe:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Unesite prioritet ID grupe za svakog Korisnika Prioriteta."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1547,244 +1724,306 @@ msgstr ""
 "Unesite postotak dopuštene veze propusnosti svake Grupe Prioriteta koja se "
 "može koristiti. Zbir svih grupa mora biti ukupno 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Unesite postotak propusnosti prioritetne grupe svakog korisnika koji je može "
 "koristiti."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Omogući ili onemogući striktnu propusnost svakog korisnika prioriteta."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Unesite klasu prometa za svakog korisnika prioriteta."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Kori_sničko ime:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Usluga:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Prikaži _lozinku"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Lozinka:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Sprega"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Roditeljski interfejs:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Roditeljski interfejs:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Parica (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Interfejs priložene jedinice (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Medijski nezavisan interfejs (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ručno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Usluga:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Klonirana MAC adresa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "L_ozinka privatnog ključa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Podrazumijevana"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Emitovanje"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "L_ozinka privatnog ključa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Brzina:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Puni _dupleks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Automatski se povežite sa _VPN kada koristite ovu konekciju"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Svi _korisnici se mogu spojiti na ovu mrežu"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Automatski se povežite na ovu mrežu kada je dostupna"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Automatski se povežite sa _VPN kada koristite ovu konekciju"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Poda_ci o vezi"
+msgid "Firewall _zone"
+msgstr "Protupožarni zid _zona:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Grupne veze:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Zanemari automatski dobijene puteve"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "Protupožarni zid _zona:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1793,7 +2032,7 @@ msgstr ""
 "IP adrese identifikuju vaš računar na mreži.  Kliknite na dugme „Dodaj“ da "
 "biste dodali IP adresu."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1801,128 +2040,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatski, samo adrese"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Režim _prenosa:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Režim _prenosa:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Ime uređaja + broj"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Režim:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatski s ručnim DNS postavkama"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Lokalna-Veza"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Podijeljeno sa ostalim računarima"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Način:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1933,8 +2176,8 @@ msgstr ""
 "podešavanja vašeg računara. Ukoliko želite da koristite DHCP klijent "
 "identifikator, unesite ga ovdje."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1942,25 +2185,26 @@ msgstr ""
 "Domeni se koristite za rješavanje imena domaćina. Koristite zareze da "
 "odvojite više domena."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP IB klijenta:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Domeni _pretrage:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS ser_vers:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1968,11 +2212,11 @@ msgstr ""
 "IP adrese imena domena servera se koriste za rješavanje imena domaćina. "
 "Koristite zareze da odvojite više adresa imena domena servera."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Zahtijeva IPv_4 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1980,25 +2224,35 @@ msgstr ""
 "Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze "
 "ukoliko ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rute…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Omogućeno (preferiraj javnu adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Omogućeno (preferiraj privremenu adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Omogući"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2008,15 +2262,20 @@ msgstr ""
 "zareze kako bi ste odvojili više DNS adresa. Link - lokalnih adresa će "
 "automatski biti vidljiv za povezivanje sa sučeljima."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6 _proširenja privatnosti:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Zahtijeva IPv_6 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2024,755 +2283,861 @@ msgstr ""
 "Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze "
 "ukoliko ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrički"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Osnovni"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Broj:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_Mrežni IB:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Izmjeni..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Dozvoli _roaming ukoliko nema domaće mreže"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Prika_ži lozinke"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Provjera autentičnosti"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Dozvoljeni načini:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Podesi _načine…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Koristi šifrovanje od tačke do tačke (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Zahtevaj 128-bitno šifrovanje"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Koristi _rečit MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Dozvoli _BSD pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Dozvoli _Deflate pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Koristi _komprimovanje TCP zaglavlja"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Odjek"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Šalji PPP _eho pakete"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Način:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Ubacite grupnu konfiguraciju iz datoteke..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Način:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet mreže"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioritet:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Privatni _ključ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Link _up kašnjenje:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Link _dolje kašnjenje:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Roditeljski interfejs:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _ciljevi:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _ciljevi:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Ubacite grupnu konfiguraciju iz datoteke..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_JSON konfig:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Bandwidth grupa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioritet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Grupne veze:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Hardverska adresa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Hardverska adresa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Jačina prijenosa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Jačina prijenosa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Roditeljski interfejs:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Ime VLAN interfejsa:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Klonirana MAC adresa:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Ime uređaja + broj"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + broj"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "B_ezbjednost:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Jačina prijenosa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Protok:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Opseg:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Dozvoljene metode potvrde identiteta"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Proširljiv Autentifikacioni Protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokol autentifikacije lozinkom"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Izazovno Rukovanje Autentifikacioni Protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Majkrosoftov autentifikacioni protokol izazovnog rukovanja"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Majkrosoftov autentifikacioni protokol izazovnog rukovanja verzija 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2782,189 +3147,184 @@ msgstr ""
 "autentifikacije. Ako veza ne uspije, pokušajte da isključite podršku za neke "
 "metode."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Povez"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tim"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN dodatak nije uspeo da ispravno unese VPN vezu\n"
-"\n"
-"Greška: nema vrste VPN servisa."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Ne mogu da pročitam datoteku „%s“ ili ona ne sadrži poznate VPN podatke o "
-"vezi\n"
+"VPN dodatak nije uspeo da ispravno unese VPN vezu\n"
 "\n"
-"Greška: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Nepoznata greška"
+"Greška: nema vrste VPN servisa."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuelno"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Uvezi spašenu VPN konfiguraciju..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Ne mogu da pokrenem prozorče za izmjenu veze zbog nepoznate greške."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Jeste li sigurni da želite da obrišete vezu %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "V_PN veze"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Mrežni izlaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrički"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Uređujem %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Uređujem neimenovanu vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Ime _veze:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Greška u pokretanju uređivača"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Nije uspjelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2972,53 +3332,50 @@ msgstr ""
 "Uređivač veza nije mogao da pronađe neke potrebne resurse (.ui datoteka nije "
 "pronađena)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Sačuvaj sve promjene u ovoj vezi."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Autentifikujte se kako bi sačuvali ovu vezu za sve korisnike računara."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Ne mogu stvoriti konekciju"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nepoznata greška kreiranja prozora za uređivanje."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Greška u pokretanju uređivača"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Nije uspjelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3027,48 +3384,49 @@ msgstr ""
 "Uključite ovu opciju da isključite upozorenja o CA certifikatima u EAP "
 "potvrđivanju identiteta."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Ime _veze:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Izvoz..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nikad"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "sad"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3076,7 +3434,7 @@ msgstr[0] "prije %d minut"
 msgstr[1] "prije %d minuta"
 msgstr[2] "prije %d minuta"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3084,7 +3442,7 @@ msgstr[0] "prije %d sat"
 msgstr[1] "prije %d sata"
 msgstr[2] "prije %d sati"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3092,7 +3450,7 @@ msgstr[0] "prije %d dan"
 msgstr[1] "prije %d dana"
 msgstr[2] "prije %d dana"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3100,7 +3458,7 @@ msgstr[0] "prije %d mjesec"
 msgstr[1] "prije %d mjeseca"
 msgstr[2] "prije %d mjeseci"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3108,123 +3466,168 @@ msgstr[0] "prije %d godine"
 msgstr[1] "prije %d godine"
 msgstr[2] "prije %d godina"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Nije uspjelo dodavanje veze"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Tim konekcija %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Tim konekcija %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Posljednje korišteno"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Uređuje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentifikujte se da biste izmijenili izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Briše izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentifikujte se da biste obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ne znam kako da napravim „%s“ vezu"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Greška prilikom uređivanja veze"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Greška pri stvaranju veze"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Nije uspjelo dodavanje veze"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Nema VPN dodataka instaliranih."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ne znam kako da napravim „%s“ vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Nisam našao vezu koja ima UUID „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Mrežne konekcije"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "V_PN veze"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X Sigurnost"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Nije moguće učitati 802.1X Sigurnosni korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Koristi 802.1_X bezbjednost za ovu vezu"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Nije moguće učitati Bluetooth korisnički interfejs."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Vezana konekcija %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet mreža"
 
 #         translations.
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Bežična Wi-Fi mreža"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Ne mogu učitati traku korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Primarno:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Vezana konekcija %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Ne mogu učitati most korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Most veza %d"
@@ -3232,32 +3635,37 @@ msgstr "Most veza %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Most Port"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Ne mogu učitati most port korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Nije moguće učitati DCB korisnički interfejs."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Roditeljski interfejs:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza „%d“"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3267,44 +3675,43 @@ msgstr ""
 "Ova opcija zaključava ovu konekciju za mrežni uređaj sa ovdje unesenom MAC "
 "adresom. Primjer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorisan"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ne mogu učitati ethernet korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Klonirana MAC adresa:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet konekcija %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Podrazumijevana"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3314,11 +3721,11 @@ msgstr ""
 "zona, odabiranje rezultira u korist zadane zone postavljene u protupožarnom "
 "zidu. Upotrebljivo samo ako je firewalld aktivan."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Nije moguće učitati Općeniti korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3329,158 +3736,162 @@ msgstr ""
 "Ova opcija zaključava ovu konekciju za mrežni uređaj sa ovdje unesenom MAC "
 "adresom. Primjer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Nije moguće učitati InfiniBand korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand konekcija %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Ne mogu da učitam IPv4 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ethernet konekcija %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatski (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatski (VPN) samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatski (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatski (PPPoE) samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatski (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatski (DHCP) samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Samo veži-lokalno"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Dodatni DNS ser_vers:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dodatni domeni _pretrage:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Uređujem IPv4 rute za %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 podešavanja"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Ne mogu da učitam IPv4 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Uređujem IPv6 rute za %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 podešavanja"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Ne mogu da učitam IPv6 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Nije moguće učitati WiMAX korisnički ulazni uređaj."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX konekcija %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Dupli robovi"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Robovi '%s' i '%s' primjenjuju se na uređaju '%s'"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3489,25 +3900,25 @@ msgstr ""
 "Robovi '%s' i '%s' odnose se na različite virtualne portove ('%s' i '%s') na "
 "istom fizičkom uređaju."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za mobilnu, širokopojasnu mrežu."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog širokopojasnog dobavljača"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3516,90 +3927,86 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaš dobavljač mobilnih širokopojasnih "
 "usluga.  Ukoliko niste sigurni, pitajte vašeg dobavljača."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj dobavljač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj provajder koristi C_DMA-baziranu tehnologiju (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ništa"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Uređujem PPP autentifikacione načine za %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP podešavanja"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da učitam PPP korisničko sučelje."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Ne mogu učitati traku korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Greška: datoteka ne sadržava ispravnu JSON konfiguraciju"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Ne mogu učitati grupni korisnički interfejs."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Tim konekcija %d"
@@ -3607,69 +4014,69 @@ msgstr "Tim konekcija %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Tim port"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Ne mogu učitati grupni korisnički port uređaj."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Nema mrežnih veza"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Nije moguće učitati vlan korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN konekcija %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Nije moguće učitati VPN-korisnički interfejs."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Ne mogu da nađem uslugu VPN dodatka za „%s“."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Ne mogu da nađem uslugu VPN dodatka za „%s“."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Greška veze"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Nije moguće učitati VPN-korisnički interfejs."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Ne mogu da nađem uslugu VPN dodatka za „%s“."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Izaberi vrstu VPN konekcije"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3680,7 +4087,7 @@ msgstr ""
 "koju želite da kreirate ne pojavljuje na listi, možda nemate ispravan VPN "
 "dodatak instaliran."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3689,7 +4096,7 @@ msgstr ""
 "Ova opcija zaključava ovu konekciju na Wi-Fi pristupnu tačku (AP) određenu "
 "od ovdje unešenog BSSID. Primjer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3699,96 +4106,94 @@ msgstr ""
 "Ova opcija zaključava ovu konekciju za mrežni uređaj sa ovdje unesenom MAC "
 "adresom. Primjer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nije moguće učitati Wi-Fi korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Bilo koji uređaj"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi konekcija %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitni ključ (Hex ili ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lozinka"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamički WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Lični WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nije moguće učitati Wi-Fi sigurnosni korisnički ulazni uređaj; nedostaje Wi-"
 "Fi podešavanje."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi Sigurnost"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nije moguće učitati Wi-Fi sigurnosni korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Već postoji datoteka „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Da li želite da zamijenite %s VPN vezom koju hoćete da sačuvate?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3799,223 +4204,106 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Otključaj"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automatski otključaj ovaj uređaj"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Podaci o vezi"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktivne mrežne veze"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Nema _tražene CA potvrde"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Privatni _ključ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "L_ozinka privatnog ključa:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Ko_risnikov sertifikat:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Vaša mobilna širokopojasna veza je podešena sa sljedećim parametrima:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Vaš uređaj:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Vaš provajder:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Vaš plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Biće napravljena veza sa vašim mobilnim širokopojasnim provajderom koristeći "
-"podešavanja koja ste izabrali. Ako povezivanje ne uspje, ili ne možete da "
-"pristupite mrežnim resursima, provjerite svoje postavke. Da biste izmijenili "
-"vaša podešavanja mobilne širokopojasne veze, izaberite \"Mrežne veze\" iz "
-"menija Sistem >> Podešavanja."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Potvrdite podešavanja mobilne širokopojasne veze"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Moja država nije na spisku"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nije na listi"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Izaberite vaš plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Izabrani APN plan (Ime Tačke Pristupa):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Upozorenje: Izbor pogrešnog plana može da dovede do problema pri "
-"obračunavanju vašeg naloga širokopojasne veze ili može spriječiti "
-"povezivanje.\n"
-"\n"
-"Ako niste sigurni o vašem planu obratite se vašem provajderu za APN vašeg "
-"plana."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Izaberite vaš plan obračunavanja"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Moj plan nije na spisku..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Izaberite vašeg provajdera iz _spiska:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provajder"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Provajder:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Moj provajder koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Moj provajder koristi CDMA tehnologiju (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Izaberite vašeg Provajdera"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista zemalja ili regiona:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Zemlja ili region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Moja država nije na spisku"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Izaberi zemlju ili regiju pružaoca usluga"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Bilo koji uređaj"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna, širokopojasna veza"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4023,261 +4311,361 @@ msgstr ""
 "Ovaj pomoćnik vam pomaže da lako podesite mobilnu širokopojasnu vezu prema "
 "mreži mobilnih telefona (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Biće vam potrebne sljedeće informacije:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Ime vašeg provajdera širokopojasnih usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Ime vašeg plana obračunavanja širokopojasnih usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(u nekim slučajevima) APN (Ime Tačke Pristupa) vašeg plana obračunavanja "
 "širokopojasnih usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Bilo koji uređaj"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Podesi mobilnu, širokopojasnu vezu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova mobilna, širokopojasna veza"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Zemlja ili region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izaberi zemlju ili regiju pružaoca usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Izaberite vašeg provajdera iz _spiska:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Moj provajder koristi GSM tehnologiju (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Moj provajder koristi CDMA tehnologiju (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Izaberite vašeg Provajdera"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Izaberite vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izabrani APN plan (Ime Tačke Pristupa):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Upozorenje: Izbor pogrešnog plana može da dovede do problema pri "
+"obračunavanju vašeg naloga širokopojasne veze ili može spriječiti "
+"povezivanje.\n"
+"\n"
+"Ako niste sigurni o vašem planu obratite se vašem provajderu za APN vašeg "
+"plana."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Izaberite vaš plan obračunavanja"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopojasna veza je podešena sa sljedećim parametrima:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Vaš uređaj:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Vaš provajder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Biće napravljena veza sa vašim mobilnim širokopojasnim provajderom koristeći "
+"podešavanja koja ste izabrali. Ako povezivanje ne uspje, ili ne možete da "
+"pristupite mrežnim resursima, provjerite svoje postavke. Da biste izmijenili "
+"vaša podešavanja mobilne širokopojasne veze, izaberite \"Mrežne veze\" iz "
+"menija Sistem >> Podešavanja."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdite podešavanja mobilne širokopojasne veze"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ništa)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA _potvrda:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Nepoznato"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Ko_risnikov sertifikat:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Otključaj"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Sačuvaj lozinku samo za ovog _korisnika"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Čuvaj lozinku za _sve korisnike"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Uvijek mi zatraži _lozinku"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Sekundarna lozinka:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Prikaži l_ozinke"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Sekundarna lozinka:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Prikaži l_ozinke"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundarna lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Prekini vezu"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nikakva"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamički WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Lozinke ili ključevi enkripcije su potrebni za pristup na Wi-Fi mrežu '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebna Autentikacija Wi-Fi mreže"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentifikacija potrebna od Wi-Fi mreže"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Kreirajte Novu Wi-Fi Mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nova Wi-Fi mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Unesite ime za Wi-Fi mrežu koju želite kreirati."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena Wi-Fi mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "Unesite ime i sigurnosne detalje skrivene Wi-Fi mreže koju želite kreirati."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi _sigurnost:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "K_onekcija:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi _punjač:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne mogu da pronađem provajdera i želim da ga unesem _ručno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Provajder:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista zemalja ili regiona:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Zemlja ili region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Žičana"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mreža"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4287,17 +4675,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, fuzzy, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s:%s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _sigurnost:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime mreže:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "K_onekcija:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _punjač:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4305,7 +4715,7 @@ msgstr ""
 "Ovaj program je komponenta NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4313,413 +4723,480 @@ msgstr ""
 "Ovaj program nije namijenjen za rad u komandnoj liniji, već je dio Gnom "
 "radnog okruženja."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nije omogućeno"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nije registrovan"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kućna mreža (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Kućna mreža"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "pretražujem"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija je odbijena"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mreža u romingu (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Mreža u romingu"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN kod za SIM karicu '%s' na '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Potreban je PIN kod"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Potreban je PIN kod za povezivanje mobilnog, širokopojasnog uređaja"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Povezani ste na mobilnu širokopojasnu vezu „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s veza"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER ili PEM sertifikati (*.der, *.pijem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "DER, PEM,  ili PKCS#12 privatni ključevi (*.der, *.pijem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Nema _tražene CA potvrde"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentifikovan"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Oboje"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anonimni _identitet:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _datoteka:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Unutrašnja prijava:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Izaberite sertifikat Potvrđivanja Autoriteta (CA)..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Verzija 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA _potvrda:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Nema _tražene CA potvrde"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _verzija:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit lozinka"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Prikaži l_ozinke"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Nema _tražene CA potvrde"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Nema _tražene CA potvrde"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "BRZO"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunelski TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Podrazumijevano)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvoreni sistem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Dijeljeni ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Podrazumijevano)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ključ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "P_rikaži ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP i_ndeks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tip:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (osnovno)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorisan"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Ažuriranje tajni veze nije uspjelo zbog nepoznate greške."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritet:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Automatski se povežite na ovu mrežu kada je dostupna"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Poda_ci o vezi"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Ne mogu da uvezem VPN vezu"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Ne mogu da pročitam datoteku „%s“ ili ona ne sadrži poznate VPN podatke o "
+#~ "vezi\n"
+#~ "\n"
+#~ "Greška: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Nepoznata greška"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Izaberite sertifikat Potvrđivanja Autoriteta (CA)..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA _potvrda:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Programče Upravnik mreže"
@@ -4753,30 +5230,6 @@ msgstr "_Tip:"
 #~ 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"
 
@@ -4957,9 +5410,3 @@ msgstr "_Tip:"
 
 #~ msgid "WiMAX"
 #~ msgstr "WiMAX"
-
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Nije moguće učitati WiMAX korisnički ulazni uređaj."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX konekcija %d"
diff --git a/po/ca.po b/po/ca.po
index f77968b7..e89c5a54 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-12-06 09:38+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-06-24 20:41+0100\n"
 "Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -26,48 +26,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Gestioneu les connexions de xarxa"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 msgid "Advanced Network Configuration"
 msgstr "Configuració de xarxa avançada"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gestioneu i modifiqueu els paràmetres de connexió de xarxa"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Inhabilita les notificacions de connexió"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
 "se a una xarxa."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Inhabilita les notificacions de desconnexió"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
 "desconnectar-se d'una xarxa."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Inhabilita les notificacions de la VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -75,52 +84,53 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
 "se o desconnectar-se d'una VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "No mostris les notificacions de xarxes disponibles"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi hagi "
 "disponibles xarxes sense fil."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Segell"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Inhabilita la creació de connexions sense fil"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc en "
 "utilitzar la miniaplicació."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Mostra la miniaplicació a l'àrea de notificació"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
 "notificació."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignora el certificat de CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -128,7 +138,7 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en l'autenticació EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -136,15 +146,15 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en la segona fase de l'autenticació EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Editor de connexions del NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -152,7 +162,7 @@ msgstr ""
 "El NetworkManager és un servei de sistema per gestionar i configurar les "
 "vostres connexions de xarxa i els vostres dispositius."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -160,21 +170,21 @@ msgstr ""
 "El programa nm-connection-editor funciona amb el NetworkManager per crear i "
 "editar perfils existents de connexions per al NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Els desenvolupadors del NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "la classe d'objecte «%s» no té cap propietat anomenada «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "la propietat «%s» de la classe d'objecte «%s» no es pot escriure"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -182,20 +192,20 @@ msgstr ""
 "la propietat «%s» de construcció per a l'objecte «%s» no es pot establir "
 "després de la construcció"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "«%s::%s» no és un nom vàlid de propietat: «%s» no és un subtipus de GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "no es pot establir la propietat «%s» de tipus «%s» a partir d'un valor de "
 "tipus «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -204,81 +214,80 @@ msgstr ""
 "el valor «%s» de tipus «%s» no és vàlid o està fora de rang per a la "
 "propietat «%s» de tipus «%s»"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticació 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1097
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1103
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "Nom de _xarxa"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "segur."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Ha fallat l'addició/activació de la connexió"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Ha fallat la connexió"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Ha fallat la desconnexió del dispositiu"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Ha fallat la desconnexió"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "No tornis a mostrar aquest missatge"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +298,7 @@ msgstr ""
 "S'ha desconnectat la connexió VPN «%s» perquè s'ha interromput la connexió "
 "de xarxa."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -300,7 +309,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè s'ha interromput la "
 "connexió de xarxa."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +319,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN s'ha aturat "
 "de manera inesperada."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +330,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN ha retornat "
 "una configuració no vàlida."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -331,7 +340,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè s'ha acabat el temps "
 "d'espera de l'intent de connexió."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -341,7 +350,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN no s'ha "
 "iniciat en el temps establert."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +360,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha pogut iniciar el "
 "servei VPN."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -361,7 +370,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha trobat cap secret "
 "VPN vàlid."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +380,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè els secrets VPN no són "
 "vàlids."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -380,7 +389,7 @@ msgstr ""
 "\n"
 "No s'ha pogut establir la connexió VPN «%s»."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -391,19 +400,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "S'ha establert correctament la connexió VPN.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Missatge d'entrada de la VPN"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "No s'ha pogut establir la connexió VPN"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -417,7 +426,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -430,562 +439,573 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "el dispositiu no està preparat (manca el microprogramari)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "el dispositiu no està preparat"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "no es gestiona el dispositiu"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "No hi ha cap dispositiu de xarxa disponible"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configura la VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Afegeix una connexió VPN…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "No s'està executant el NetworkManager…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la gestió de xarxes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Habilita la gestió de _xarxes"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Habilita el _sense fil"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Habilita la banda ampla _mòbil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Habilita les n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Edita les connexions…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Esteu connectat a «%s»."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "S'ha desconnectat la connexió de xarxa."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa «%s»…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa «%s»…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a «%s»…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "La connexió de xarxa «%s» és activa"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "S'està iniciant la connexió VPN «%s»…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió VPN «%s»…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa VPN «%s»…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "La connexió VPN és activa"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "El codi PUK no és correcte. Contacteu amb el vostre proveïdor."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "El codi PIN no és correcte. Contacteu amb el vostre proveïdor."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "S'està enviant el codi de desbloqueig…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ampla mòbil (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda ampla mòbil"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Connexió de banda ampla mòbil nova…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "S'ha establert la connexió"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Esteu connectat a la xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Esteu registrat a la xarxa local."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Esteu registrat a una xarxa d'accés itinerant."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Esteu connectat a la xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "S'està preparant la connexió de banda ampla mòbil «%s»…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "S'està configurant la connexió de banda ampla mòbil «%s»…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Cal l'autenticació d'usuari per a la connexió de banda ampla mòbil «%s»…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "La connexió de banda ampla mòbil «%s» és activa"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automàtic"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Xarxes amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Xarxes amb fil"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Xarxa amb fil"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Esteu connectat a la xarxa amb fil."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa amb fil «%s»…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "S'està configurant la connexió de xarxa amb fil «%s»…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa amb fil «%s»…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa amb fil «%s»…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "La connexió de xarxa amb fil «%s» és activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticació DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "D'ac_ord"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Connecta't a la xarxa sense fil oculta…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Crea una xarxa sense fil _nova…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "No s'ha pogut afegir una connexió nova"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Privilegis insuficients."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Xarxes sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Xarxa sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Xarxa sense fil"
 msgstr[1] "Xarxes sense fil"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Les xarxes sense fil estan inhabilitades"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "L'interruptor de maquinari ha inhabilitat la xarxa sense fil"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Més xarxes"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Hi ha xarxes sense fil disponibles"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilitzeu el menú de xarxa per connectar-vos a una xarxa sense fil"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Esteu connectat a la xarxa sense fil «%s»."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa sense fil «%s»…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "S'està configurant la connexió de xarxa sense fil «%s»…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa sense fil «%s»…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa sense fil per a «%s»…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "La connexió de xarxa sense fil «%s» és activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "La connexió de xarxa sense fil «%s» és activa"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:968 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinàmic"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Més adreces"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (predeterminat)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconeguda"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adreça de difusió"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Màscara de subxarxa"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primària"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Contrasenya _secundària:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfície"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adreça del maquinari"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguretat:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Ruta predeterminada"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorada"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Punt d'accés Wi-Fi"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipus de VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Passarel·la VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nom d'usuari de la VPN"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Bàner de la VPN"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Connexió base"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconeguda"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "No s'ha trobat cap connexió activa vàlida"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -995,22 +1015,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "i molts col·laboradors i traductors voluntaris"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicació per a l'àrea de notificació per gestionar els dispositius i "
 "les connexions de xarxa."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Lloc web del NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Carles Ferrando Garcia <carles.ferrando@gmail.com>"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1018,33 +1038,33 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "necessaris (no s'ha trobat el fitxer d'interfície d'usuari)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Recursos que manquen"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Contrasenya de la xarxa de banda ampla mòbil"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1054,25 +1074,25 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Codi PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Mostra el codi PIN"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1082,41 +1102,41 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Codi PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Codi PIN nou:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Torneu a introduir el codi PIN nou:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostra els codis PIN/PUK"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "La connexió no tenia la configuració VPN"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "No s'ha pogut escriure la connexió UI VPN: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "No s'ha pogut escriure la connexió UI VPN: escriptura incompleta"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1124,41 +1144,41 @@ msgstr ""
 "Les adreces IP identifiquen el vostre ordinador a la xarxa. Feu clic al botó "
 "«Afegeix» per afegir una adreça IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nora les rutes obtingudes automàticament"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Utilitza aquesta connexió només per a recursos de la seva xarxa"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1166,15 +1186,15 @@ msgstr ""
 "Si s'habilita, aquesta connexió no s'utilitzarà mai com a connexió de xarxa "
 "predeterminada."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "Crea..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Seleccioneu un tipus de connexió"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1186,84 +1206,93 @@ msgstr ""
 "Si voleu crear una connexió VPN i el tipus que voleu crear no apareix a la "
 "llista, és probable que no tingueu el connector VPN adequat instal·lat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Dispositiu"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Reserva activa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Difusió"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Balanceig de càrrega de transmissió adaptativa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Balanceig de càrrega adaptatiu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomanat)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "_Connexions vinculades"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "M_ode"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "_Freqüència del seguiment"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Nom de la _interfície"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "Seguiment de l'_enllaç"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "_Objectius ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1271,19 +1300,19 @@ msgstr ""
 "Una adreça IP, o una llista d'adreces IP separada per comes, que es "
 "comprovaran quan es comprovi l'estat de l'enllaç."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Retard de la _connexió"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Retard de la _desconnexió"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Primària"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1291,66 +1320,69 @@ msgstr ""
 "El nom de la interfície del dispositiu primari. Si s'estableix, aquest "
 "dispositiu serà sempre l'esclau actiu quan estigui disponible."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "_Cost del camí"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Prioritat"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "Mode de _hairpin"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Connexions _puntejades"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Retard de _retransmissió"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "Temps de «_Hello»"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Retard de retransmissió STP, en segons"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Temps de «hello» STP, en segons"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Habilitat el tafaneig I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1361,17 +1393,17 @@ msgstr ""
 "col·lisions de hash, el sistema pot negar-se a habilitar la funció fins que "
 "es resolguin les col·lisions."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_Habilita l'STP (protocol d'arbre d'abast)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "Controla si el protocol d'arbre d'abast (STP) està habilitat en aquest pont"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1379,27 +1411,27 @@ msgstr ""
 "Prioritat STP per aquest pont. Els valors baixos són «millors»; el pont de "
 "prioritat més baixa serà elegit pont arrel."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "Edat _màxima"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Edat del missatge màxima STP, en segons"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "Temps d'_envelliment"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "El temps d'envelliment de l'adreça MAC ethernet, en segons"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Mascara de grup _endavant"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1411,40 +1443,40 @@ msgstr ""
 "màscara no pot tenir els bits 0, 1 o 2 perquè s'utilitzen per a STP, marcs "
 "pausa MAC i LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automàtic"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predeterminat"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "error no especificat"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Preserva"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Permanent"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Aleatori"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Estable"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1454,182 +1486,225 @@ msgstr ""
 "adreça MAC com a adreça de maquinari. Aquest mètode es coneix com a "
 "falsejament d'identitat MAC. Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Adreça MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Adreça HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s no vàlid per a  %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s no vàlid (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "nom no vàlid d'interfície per a %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nom no vàlid d'interfície (%s)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "no es pot analitzar el nom del dispositiu"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "Adreça del maquinari no vàlida"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "%s no vàlid (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "dispositiu"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "%s no vàlid (%s)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Utilitza «Data Center Bridging» (DCB) per a aquesta connexió"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Control de flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Característica"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Habilita"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Anuncia"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Willing"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Opcions…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grups prioritaris"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Control de prioritat de flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Habilita o inhabilita la prioritat de transmissió en pausa per a cada "
 "prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Classe de trànsit"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Amplada de banda estricta"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Amplada de banda prioritària"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Amplada de banda del grup"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Identificador de grup"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Introduïu l'identificador de grup de prioritat per cada prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1637,36 +1712,36 @@ msgstr ""
 "Introduïu l'amplada de banda permesa, en percentatge, que cada grup de "
 "prioritat utilitzarà. La suma de tots els grups ha de ser 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Introduïu el percentatge de l'amplada de banda de prioritat de grup que cada "
 "prioritat d'usuari pot utilitzar."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Habilita o inhabilita l'amplada de banda estricta per a cada prioritat "
 "d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Introduïu la classe de trànsit per a cada prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "Nom d'_usuari"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Nom d'usuari usat per autenticar amb el servei PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1675,53 +1750,51 @@ msgstr ""
 "l'especificat servei. Per a la majoria dels proveïdors, això s'ha de deixar "
 "en blanc."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Servei"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Most_ra la contrasenya"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "La contrasenya usada per autenticar amb el servei PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Contrasenya"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "Interfície _PPP"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "Interfície _pare"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Un nom arbitrari per assignar a la interfície PPP recentment creada."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "La interfície on s'establirà la connexió PPP."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "Interfície _reclamada"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1733,138 +1806,131 @@ msgstr ""
 "pot utilitzar per a interfícies Ethernet. nm-applet només pot activar la "
 "connexió si aquesta opció està seleccionada."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Parell creuat (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Connector Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "Connector BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Connector Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Mig"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Complet"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Dispositiu"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "Adreça _MAC clonada"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Activació per LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Per de_fecte"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignora"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unidifusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_tidifusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Difusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Mà_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Reactiva'l per contrasenya de LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Contrasenya d'activació per LAN (una MAC Ethernet). Sols és vàlida per a "
 "paquets màgics."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Negociació d'enlla_ç"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1874,11 +1940,11 @@ msgstr ""
 "valors de «Velocitat» i «Dúplex» sense verificar la compatibilitat del "
 "dispositiu. Si no teniu seguretat, deixeu aquí «Ignora» o trieu «Automàtic»."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Velocitat"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1890,11 +1956,11 @@ msgstr ""
 "vostre dispositiu."
 
 # FIXME (dpm)
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Dúple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1904,31 +1970,31 @@ msgstr ""
 "seleccionen les opcions «Ignora» i «Automàtic». Abans d'especificar un mode "
 "de dúplex assegureu-vos que el vostre dispositiu el suporta."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "No"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Tots els _usuaris es poden connectar a aquesta xarxa"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Connecta automàticament la _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "_Zona del tallafoc"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "Connexió li_mitada"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1940,11 +2006,11 @@ msgstr ""
 "per indicar a les aplicacions, o «Automàtic» per utilitzar un valor "
 "predeterminat en funció del tipus de connexió i d'altres heurístiques."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Connecta de forma _automàtica amb prioritat"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1954,7 +2020,7 @@ msgstr ""
 "connexions amb números més alts quan se seleccionen perfils per a "
 "l'activació automàtica. El valor predeterminat és 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1962,7 +2028,7 @@ msgstr ""
 "Les adreces IP identifiquen el vostre ordinador a la xarxa. Feu clic al botó "
 "«Afegeix» per afegir una adreça IP."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1974,127 +2040,126 @@ msgstr ""
 "afegir una adreça IP. Si no es proveeix cap adreça, es determinarà un rang "
 "automàticament."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Adreces addicionals estàtiques"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adreces"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adreça (opcional)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "Mode de _transport"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Nom del dispositiu"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Dispositiu pare"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Mode"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "IP local"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "IP remota"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Clau d'entrada"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Clau de sortida"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automàtic amb paràmetres manuals per al DNS"
 
 # http://en.wikipedia.org/wiki/Link-local_address (dpm)
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Connexió 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:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Compartit a altres ordinadors"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Mètode"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2104,8 +2169,8 @@ msgstr ""
 "vostre ordinador a l'administrador de la xarxa. Si voleu utilitzar un "
 "identificador de client DHCP, introduïu-lo aquí."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2113,25 +2178,23 @@ msgstr ""
 "Dominis utilitzats en resoldre els noms d'amfitrió. Utilitzeu la coma per "
 "separar múltiples dominis."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "Identificador del client de D_HCP"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "_Dominis de cerca"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "Servidors _DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2140,11 +2203,11 @@ msgstr ""
 "d'amfitrió. Utilitzeu la coma per separar múltiples adreces de servidor de "
 "nom de domini."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Cal l'adreçament IPv_4 per completar la connexió"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2152,34 +2215,34 @@ msgstr ""
 "Quan es connecti a xarxes IPv6, permet completar la connexió per IPv6 en cas "
 "que la configuració IPv4 falli."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rutes..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Inhabilitada"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Habilitat (prefereix una adreça pública)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Habilitat (prefereix una adreça temporal)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Privadesa estable"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2190,19 +2253,19 @@ msgstr ""
 "de nom de domini. Les adreces «Link-local» s'inclouran a l'àmbit de la "
 "interfície de connexió."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "Extensions de _privacitat d'IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "Mode de _generació d'adreça IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Cal l'adreçament IPv_6 per completar la connexió"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2210,28 +2273,28 @@ msgstr ""
 "Quan es connecti a xarxes IPv4, permet completar la connexió per IPv4 en cas "
 "que la configuració IPv6 falli."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Comprova"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Estricte"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "El nom del dispositiu MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2239,7 +2302,7 @@ msgstr ""
 "El nom de la interfície pare o connexió UUID pare des d'on s'ha de crear la "
 "interfície MACSEC."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2247,15 +2310,15 @@ msgstr ""
 "El nom de la interfície pare o connexió UUID pare des d'on s'ha de crear la "
 "interfície MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr "El nom de la clau de l'associació-connectivitat pre compartida"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr " La clau de l'associació-connectivitat pre compartida"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2265,203 +2328,203 @@ msgstr ""
 "(Clau d'acord MACsec). Per al mode EAP, ompliu els paràmetres a la pàgina de "
 "seguretat 802.1X "
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Claus"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Paràmetres"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Validació"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "Port SCI"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Especifica el mode de validació per a marcs d'entrada"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Xifra"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Si el trànsit transmès cal que estigui xifrat"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "El component del port del SCI (Identificador de canal segur)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Nú_mero"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Identificador de xar_xa"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Canvia…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permet la _itinerància si la xarxa domèstica no està disponible"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:441
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Mo_stra les contrasenyes"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Mètodes admesos"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configuració dels _mètodes..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compressió"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Utilitza l'encriptació punt a punt (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Cal l'encriptació de 128 bits"
 
 # FIXME (dpm)
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Utilitza l'MPPE amb _estat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permet la compressió _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permet la compressió _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Utilitza la compressió de les _capçaleres TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eco"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Envia paquets d'_eco de PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Cap"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Sols per a navegadors"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Usa aquesta configuració de servidor intermediari per a clients/esquemes de "
 "sols navegador."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "URL de PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "Script de PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL a partir de la qual l'script PAC s'ha d'obtenir."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importa un script des d'un fitxer…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Mètode"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "A_vançat…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Establert pel mestre"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Estat del port Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Opcions avançades d'equip"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "ID de la _cua"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2469,20 +2532,20 @@ msgstr ""
 "Nombre d'esclats de NAs no sol·licitats i paquets ARP no necessaris enviats "
 "després que el port s'habilita o deshabilita."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID de la cua a la qual s'hauria de mapar aquest port."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Opcions del runner de la còpia de seguretat activa"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Prioritat del port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2490,32 +2553,32 @@ msgstr ""
 "El valor és un nombre positiu en mil·lisegons. Especifica un interval entre "
 "esclats de paquets de notificació de parells."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Prioritat del port. El número més gran vol dir una prioritat més gran."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _fixat"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr "No desselecioneu el port si un millor esdevé disponible."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Opcions del runner LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "Prioritat del port _LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "_Clau del port LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2523,7 +2586,7 @@ msgstr ""
 "Nombre d'esclats de demandes de tornar a unir-se al grup de multidifusió "
 "enviades després que el port s'habilita o inhabilita."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2531,8 +2594,8 @@ msgstr ""
 "Prioritat del port d'acord amb l'estàndard LACP. El número més baix vol dir "
 "una prioritat més baixa."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2540,7 +2603,7 @@ msgstr ""
 "El valor el número de posició en mil·lisegons. Especifica un interval entre "
 "esclats de demandes de tornar a unir-se al grup de multidifusió."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2548,48 +2611,48 @@ msgstr ""
 "Clau del port d'acord amb l'estàndard LACP. Sols és possible agregar ports "
 "amb la mateixa clau."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "Monitor de l'en_llaç"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Retard de p_ujada"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Retard de baixa_da"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "_Interval d'enviament"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Retard a_bans del primer enviament"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Màxim de les respostes absents"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Amfitrió origen"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "Amfi_trió destí"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2597,8 +2660,8 @@ msgstr ""
 "Nombre màxim de respostes absents. Si s'excedeix aquest valor, es reporta "
 "l'enllaç com caigut."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2606,8 +2669,8 @@ msgstr ""
 "Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda "
 "ARP com a adreça origen."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2615,13 +2678,13 @@ msgstr ""
 "Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda "
 "com a adreça destí."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignora els paquets no vàlids dels ports _actius"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2629,13 +2692,13 @@ msgstr ""
 "Valida els paquets ARP rebuts usant els ports actius. Si no es marca això, "
 "tots els paquets ARP entrants es consideraran una resposta bona."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignora els paquets no vàlids dels ports i_nactius"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2643,13 +2706,13 @@ msgstr ""
 "Valida els paquets ARP rebuts usant els ports inactius. Si no es marca això, "
 "tots els paquets ARP entrants es consideraran com una resposta bona."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "_Envia usant els ports inactius"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2657,161 +2720,160 @@ msgstr ""
 "Per defecte, les demandes ARP s'envien usant els ports actius solament. "
 "Aquesta opció permet l'enviament fins i tot usant els ports inactius."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
 "El retard entre l'aixecament de l'enllaç i la notificació d'això al runner."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
 "El retard entre la caiguda de l'enllaç i la notificació d'això al runner."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "L'interval entre enviaments de demandes."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "El retard entre la inicialització del monitor d'enllaços i l'enviament de la "
 "primera demanda."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "El monitor d'enllaços a usar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Monitor d'enllaços"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_porta una configuració en equip des d'un fitxer…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Edita la configuració _JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Configuració crua"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Prioritat més alta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Prioritat més alta (estable)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Amplada de banda"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Nombre màxim de ports"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Prioritat del port"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Del dispositiu equip"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Des del port actiu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Des del dispositiu actiu al dispositiu equip"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Connexions _vinculades"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Balanç de la càrrega"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cable"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Qualsevol protocol L3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Qualsevol protocol L4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Nombre de notificacions de _parells"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Interval de _notificacions de parells"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "Nombre de reincorporacions de _multidifusió"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "Interval de _reincorporacions de _multidifusió"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Adreça del maquinari"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2819,19 +2881,19 @@ msgstr ""
 "Adreça desitjada de maquinari del nou dispositiu d'equip. S'accepta el "
 "format habitual d'adreça MAC."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "_Runner"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Política d'_adreça del maquinari"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Nom del runner a usar."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2840,11 +2902,11 @@ msgstr ""
 "dispositius d'equip i de port haurien d'establir-se durant el temps de vida "
 "de l'equip."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Envia marcs LACPDU _periòdicament"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2852,11 +2914,11 @@ msgstr ""
 "Si està marcat, els marcs LACPDU s'envien periòdicament junt amb els "
 "enllaços configurats. Si no està marcat, actua com «parla quan et parlin»."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Envia un marc LACPDU cada s_egon"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2866,23 +2928,23 @@ msgstr ""
 "d'enllaç de transmetre paquets LACPDU. Si està marcat, s'enviarà paquets un "
 "cop per segon. En cas contrari, s'enviaran cada 30 segons."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "Prioritat del _sistema"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "Ports _mínims"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Política de selecció d'_agregador"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Prioritat de sistema, el valor pot ser 0-65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2890,11 +2952,11 @@ msgstr ""
 "Especifica el nombre mínim de ports que han d'estar actius abans de declarar "
 "l'operador a la interfície mestra, el valor pot ser 1-255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Això selecciona la política de com se seleccionaran els agregadors."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2902,183 +2964,179 @@ msgstr ""
 "La llista de tipus de fragments (cadenes de text) que s'haurien d'usar per a "
 "la computació del resum Tx."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Camps per al resum de transmissió"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "En dècims de segon. Intervals periòdics entre rebalancejos."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Nom del balanceig Tx actiu. El balanceig Tx actiu es deshabilita per defecte."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Interval de _balanceig de la transmissió"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Balancí de la _transmissió"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Runner"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "Interfície _pare"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "Nom de la inter_fície VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "_Adreça MAC clonada"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "_Identificador de la VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Senyaladors"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Reordena les capçaleres"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "En_llaç flexible"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Nom del dispositiu + número"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "«vlan» + número"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "_Seguretat"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Client"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Punt d'accés Wi-Fi"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Po_tència de transmissió"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Velocitat"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Canal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Ban_da"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "No hi ha una autorització polkit per fer l'acció"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Mètodes d'autenticació admesos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Protocol d'autenticació extensible"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protocol d'autenticació per contrasenya"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu de Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Protocol d'autenticació per desafiament mutu de Microsoft, versió 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3087,98 +3145,94 @@ msgstr ""
 "mètodes d'autenticació. En cas que fallin les connexions, intenteu "
 "inhabilitar-ne alguns."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Vinculada"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equip"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "Túnel IP"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Sense tipus de servei VPN."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "El connector VPN no ha pogut importar la connexió VPN correctament: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Seleccioneu el fitxer a importar"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Obre"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importa una configuració VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3186,84 +3240,82 @@ msgstr ""
 "No s'ha pogut inicialitzar el diàleg d'edició de les connexions a causa d'un "
 "error desconegut."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "No s'ha pogut crear la connexió nova"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "No s'ha pogut suprimir la connexió"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Segur que voleu suprimir la connexió %s?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "Connexió _nova"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Màscara de xarxa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Passarel·la"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Mètrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "S'està editant %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "S'està editant la connexió sense nom"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Falta el nom de la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "S'està inicialitzant l'editor…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "No s'ha pogut modificar la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Configuració no vàlida %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3271,35 +3323,35 @@ msgstr ""
 "L'editor de connexions no ha pogut trobar alguns dels recursos necessaris "
 "(no s'ha trobat el fitxer d'interfície d'usuari)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Desa els canvis fets a la connexió."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiqueu-vos per desar la connexió per a tots els usuaris de l'ordinador."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "No s'ha pogut crear la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "No s'ha pogut editar la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "S'ha produït un error desconegut en crear el diàleg de l'editor de "
 "connexions."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3307,19 +3359,19 @@ msgstr ""
 "Avís: la connexió conté algunes propietats no suportades per l'editor. "
 "Aquestes es suprimiran després de desar-se."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "S'ha produït un error en inicialitzar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "No s'ha pogut afegir la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Fixa"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3327,23 +3379,23 @@ msgstr ""
 "Les etiquetes de seguretat poden impedir que alguns fitxers siguin usats en "
 "autenticació de certificats."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "_Nom de la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Exporta…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Torna a etiquetar un fitxer"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "To_rna a etiquetar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3351,212 +3403,211 @@ msgstr ""
 "Els següents fitxers no estan etiquetats per usar amb certificats "
 "autenticats. Voleu ajustar les etiquetes?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Torna a etiquetar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "mai"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ara"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa %d minut"
 msgstr[1] "fa %d minuts"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa %d hora"
 msgstr[1] "fa %d hores"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa %d dia"
 msgstr[1] "fa %d dies"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa %d mes"
 msgstr[1] "fa %d mesos"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fa %d any"
 msgstr[1] "fa %d anys"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "No s'ha pogut eliminar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Selecciona una connexió per a editar"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Selecciona una connexió per a eliminar"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Utilitzada per última vegada"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Edita la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiqueu-vos per editar la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Suprimeix la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiqueu-vos per suprimir la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Tipus de connexió desconegut"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Es desconeix com importar connexions «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "S'ha produït un error en importar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "No s'ha especificat el tipus de connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "No hi ha cap connector VPN instal·lat."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Es desconeix com crear connexions «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "S'ha produït un error en editar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "No s'ha pogut trobar cap connexió amb UUID «%s»"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "Connexions de xarxa"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Afegeix una connexió nova"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguretat 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Utilitza la seguretat 802.1_X per a aquesta connexió"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Adreça MAC del dispositiu Bluetooth. Per exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "dispositiu Bluetooth no vàlid (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Connexió Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Tipus de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Selecciona el tipus del perfil de connexió Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Xarxa d'àrea _personal"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Xarxa _de connexió telefònica"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió vinculada."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primària"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexió vinculada %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per la connexió de pont."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexió de pont %d"
@@ -3564,36 +3615,36 @@ msgstr "Connexió de pont %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port del pont"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de ponts de port."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari DCB."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió DSL."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "Interfície pare perduda"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexió DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3603,42 +3654,41 @@ msgstr ""
 "bé pel seu nom d'interfície o per la MAC permanent o per ambdós. Exemples: "
 "«em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "Ignorada"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió amb fil."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Dispositiu Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Contrasenya d'activació per LAN"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexió de xarxa amb fil %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Per defecte"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3648,11 +3698,11 @@ msgstr ""
 "una zona regular; si la seleccioneu, el tallafoc utilitzarà la zona per "
 "defecte. Només és útil si el firewallD està actiu."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari general."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3664,168 +3714,160 @@ msgstr ""
 "«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)»"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "dispositiu infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexió InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de túnel IP."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Connexió de túnel IP %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automàtic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Només adreces (VPN) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automàtic, només adreces"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automàtic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Només adreces (PPPoE) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automàtic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Només adreces (DHCP) automàtiques"
 
 # http://en.wikipedia.org/wiki/Link-local_address (dpm)
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Només adreces de connexió local"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Servidors _DNS addicionals"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Dominis de _cerca addicionals"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Edició de les rutes IPv4 per a %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Paràmetres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Adreça IPv4 «%s» no vàlida"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Adreça IPv4 no vàlida de la màscara de xarxa «%s»"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Passarel·la IPv4 «%s» no vàlida"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv4 DNS «%s» no vàlid"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automàtic, només DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Edició de les rutes IPv6 per a %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Paràmetres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Adreça IPv6 «%s» no vàlida"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefix IPv6 «%s» no vàlid"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Passarel·la IPv6 «%s» no vàlida"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv6 «%s» no vàlid"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per MACsec."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "Connexió MACSEC %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Duplica els esclaus"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Els esclaus «%s» i «%s» s'apliquen tots dos al dispositiu «%s»"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3834,27 +3876,27 @@ msgstr ""
 "Els esclaus «%s» i «%s» s'apliquen a diferents ports virtuals («%s» i «%s») "
 "del mateix dispositiu físic."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclava %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió de banda "
 "ampla mòbil."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "No s'admet el tipus de connexió de banda ampla mòbil."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccioneu el tipus de proveïdor de banda ampla mòbil"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3862,7 +3904,7 @@ msgstr ""
 "Seleccioneu la tecnologia que utilitza el vostre proveïdor de banda ampla "
 "mòbil. Si no n'esteu segur, demaneu-ho al vostre proveïdor."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en _GSM (és a dir, GPRS, EDGE, "
@@ -3870,82 +3912,80 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "cap"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Edició dels mètodes d'autenticació PPP per a %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Paràmetres PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió PPP."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari de servidor intermediari."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Error: el fitxer no conté una configuració JSON vàlida"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de l'equip."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexió en equip %d"
@@ -3953,68 +3993,67 @@ msgstr "Connexió en equip %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port de l'equip"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari del port de l'equip."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Connexió nova…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VLAN."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan arrel"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexió VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "No s'ha pogut carregar el connector de VPN d'editor per a «%s» (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "fallada desconeguda"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VPN."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "No s'ha pogut trobar el connector VPN per a «%s»."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexió VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccioneu un tipus de connexió VPN"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -4024,7 +4063,7 @@ msgstr ""
 "el tipus de connexió VPN que voleu crear no apareix a la llista, és probable "
 "que no tingueu el connector VPN adequat instal·lat."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4032,7 +4071,7 @@ msgstr ""
 "Aquesta opció bloqueja la connexió al punt d'accés sense fil (AP) "
 "especificat per l'identificador BSSID.  Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4042,98 +4081,96 @@ msgstr ""
 "bé pel seu nom d'interfície o la MAC permanent o ambdós. Exemples: «wlan0», "
 "«3C:97:0E:42:1A:19», «wlan0 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió sense fil."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Dispositiu Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:942 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinàmic 802.1X"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:995 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1013 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de la "
 "connexió sense fil. Manca un paràmetre de la connexió sense fil."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Seguretat de la xarxa sense fil"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de la "
 "connexió sense fil."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "falta el SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "La seguretat no és compatible amb el mode Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Ja existeix un fitxer anomenat «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Voleu reemplaçar %s per la connexió VPN que esteu desant?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "No es pot exportar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4144,116 +4181,103 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Exporta una connexió VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desbloqueja"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Desbloqueja automàticament aquest dispositiu"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informació de la connexió"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "Tan_ca"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Connexions de xarxa actives"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Cap certificat configurat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Cap clau configurada"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trieu una clau per al vostre certificat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#,  c-format
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, c-format
 msgid "%s private _key"
 msgstr "Clau _privada %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "Contrasenya de la clau _privada %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Trieu el vostre certificat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificat %s"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "El meu país no és a la llista"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "No és a la llista"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "El meu pla no és a la llista…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveïdor"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País o regió"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositiu GSM instal·lat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositiu CDMA instal·lat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Qualsevol dispositiu"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Connexió de banda ampla mòbil nova"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4261,84 +4285,70 @@ msgstr ""
 "L'auxiliar us ajudarà a configurar una connexió de banda ampla mòbil a una "
 "xarxa cel·lular (3G) de manera fàcil."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Us caldrà la informació següent:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "El nom del proveïdor de banda ampla"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "El nom del pla de facturació de banda ampla"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
 "facturació de banda ampla (només en alguns casos)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configura una connexió de banda ampla mòbil"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Llista de països o regions:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o regió"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Trieu el país o regió del vostre proveïdor"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Seleccioneu el proveïdor des d'una _llista:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "No hi ha el proveïdor i vull configurar la connexió _manualment:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Trieu el proveïdor"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Seleccioneu el vostre pla:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4351,13 +4361,11 @@ msgstr ""
 "Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que us "
 "n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Seleccioneu el pla de facturació"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
@@ -4365,25 +4373,21 @@ msgstr ""
 "següents:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "El dispositiu:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "El proveïdor:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "El pla:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4397,141 +4401,140 @@ msgstr ""
 "voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
 "l'entrada «Connexions de xarxa» del menú Sistema → Preferències."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(cap)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Clau a %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certificat a %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Selecciona"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Selecciona des d'un fitxer…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Trieu el certificat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "_Contrasenya del certificat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Error en iniciar a la sessió"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "S'ha produït un error en obrir la sessió"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Desbloqueja testimoni"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Emès per"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Entra el PIN %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "Inicia la sessió"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Recorda PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Desa la contrasenya només per a aquest usuari"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Desa la contrasenya per a tots els usuaris"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Demana la contrasenya cada vegada"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "No es requereix la contrasenya"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "M_ostra les contrasenyes"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Contrasenya _ternària:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "Contrasenya _secundària:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../src/libnma/nma-wifi-dialog.c:126 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Cliqueu per connectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:457 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Nou…"
 
-#: ../src/libnma/nma-wifi-dialog.c:925 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/libnma/nma-wifi-dialog.c:981 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinàmic (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1101 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../src/libnma/nma-wifi-dialog.c:1179 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4539,35 +4542,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1181 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1183 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1191 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Introduïu el nom de la xarxa sense fil que voleu crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1193 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1196 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4575,43 +4578,51 @@ msgstr ""
 "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
 "a la qual us vulgueu connectar."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Seguretat de la _xarxa sense fil"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "Co_nnexió"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "_Adaptador sense fil"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Proveïdor:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Llista de països o regions:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País o regió"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Amb fil"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malla d'OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4621,13 +4632,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4635,27 +4646,27 @@ msgstr ""
 "O bé falta la contrasenya o la connexió no és vàlida. En el segon cas heu "
 "d'editar primer la connexió amb el nm-connection-editor"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Seguretat de la _xarxa sense fil:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "Nom de _xarxa:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "Co_nnexió:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador sense fil:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Ús:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4663,7 +4674,7 @@ msgstr ""
 "Aquest programa és un component del NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4671,337 +4682,335 @@ msgstr ""
 "No es pretén que hi interaccioneu des de la línia d'ordres, sinó que "
 "s'executa en l'entorn d'escriptori GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "no està habilitat"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no està registrat"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Xarxa domèstica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Xarxa domèstica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "s'està cercant"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "s'ha denegat el registre"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s itinerant)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (itinerant)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Xarxa itinerant (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Xarxa itinerant"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Codi PIN per la targeta SIM «%s» a «%s»"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Cal que introduïu el codi PIN"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cal que introduïu un codi PIN per al dispositiu de banda ampla mòbil"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "La connexió de banda ampla mòbil «%s» és activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "itinerància"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "connexió de %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "error no definit a la seguretat 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "no s'ha seleccionat cap certificat de CA"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "els fitxers de certificat CA no existeix"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el fitxer EAP-FAST PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anònim"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticat"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ambdós"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Identitat anòni_ma"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "Fitxer _PAC"
 
 # FIXME: (dpm)
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "Autenticació _interna"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "falta el nom d'usuari EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "falta la contrasenya EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versió 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versió 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "No es _requereix cap certificat de CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "Versió del _PEAP"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Suffix del nom del certificat del servidor."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domini"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "falta el nom d'usuari EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "falta la clau EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr "manca la contrasenya de la clau privada del client EAP"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 msgid "P_rivate Key Passphrase"
 msgstr "Contrasenya de la clau privada"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 msgid "Sh_ow passphrase"
 msgstr "M_ostra la contrasenya"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "falta la identitat EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "no s'ha seleccionat cap certificat d'usuari"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "el fitxer seleccionat del certificat de l'usuari no existeix"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "no s'ha seleccionat cap clau"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "el fitxer de la clau seleccionada no existeix"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "I_dentitat"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sense EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "error desconegut quan s'estava validant la seguretat 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS per túnel"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr "Configurat externament"
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "_Autenticació"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "falta el nom d'usuari leap"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "falta la contrasenya leap"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "falta la clau wep"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols dígits "
 "hexadecimals"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -5009,7 +5018,7 @@ msgstr ""
 "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols caràcters "
 "ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5018,41 +5027,41 @@ msgstr ""
 "clau web no vàlida: la longitud %zu és incorrecta. Una clau ha de tenir "
 "longitud 5/13 (ascii) o 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clau web no vàlida: la frase de contrasenya no pot estar buida"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clau web no vàlida: la frase de contrasenya ha de tenir una longitud "
 "inferior a 64 caràcters"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema obert"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (predeterminat)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Clau"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Most_ra la clau"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "Índe_x WEP"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5061,16 +5070,25 @@ msgstr ""
 "wpa-psk no vàlida: la longitud de la clau %zu no és vàlida. Ha de ser [8,63] "
 "bytes o 64 dígits hexadecimals"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk no vàlida: no es pot interpretar una clau amb 64 bytes com a "
 "hexadecimal"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Tipus"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (predeterminat)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorada"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Connexions de xarxa actives"
+
 #~ msgid "Cannot import VPN connection"
 #~ msgstr "No es pot importar la connexió VPN"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index f5f345bf..e7244bbb 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -11,8 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-09-15 21:17+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -23,49 +24,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Gestioneu les connexions de xarxa"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Connexions de xarxa"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Connexions de xarxa actives"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gestioneu i modifiqueu els paràmetres de connexió de xarxa"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Inhabilita les notificacions de connexió"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
 "se a una xarxa."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Inhabilita les notificacions de desconnexió"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en "
 "desconnectar-se d'una xarxa."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Inhabilita les notificacions de la VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -73,52 +83,53 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions en connectar-"
 "se o desconnectar-se d'una VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "No mostres les notificacions de xarxes disponibles"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar les notificacions quan hi haja "
 "disponibles xarxes sense fil."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Segell"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "S'utilitza per determinar si cal migrar els paràmetres a una versió nova."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Inhabilita la creació de connexions sense fil"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar la creació de xarxes ad hoc en "
 "utilitzar la miniaplicació."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Mostra la miniaplicació a l'àrea de notificació"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Establiu-lo a «FALSE» (fals) per no mostrar la miniaplicació a l'àrea de "
 "notificació"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignora el certificat de CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -126,7 +137,7 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en l'autenticació EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -134,131 +145,144 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en la segona fase de l'autenticació EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticació 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "Connectat"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Nom de _xarxa:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Ha fallat l'addició/activació de la connexió"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Ha fallat la connexió"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Ha fallat la desconnexió del dispositiu"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Ha fallat la desconnexió"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "No tornes a mostrar este missatge"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "S'ha desconnectat la connexió VPN «%s» perquè s'ha interromput la connexió "
 "de xarxa."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,7 +304,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè s'ha interromput la "
 "connexió de xarxa."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN s'ha parat "
 "de manera inesperada."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -301,7 +325,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN ha retornat "
 "una configuració no vàlida."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -311,7 +335,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè s'ha acabat el temps "
 "d'espera de l'intent de connexió."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -321,7 +345,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN no s'ha "
 "iniciat en el temps establit."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -331,7 +355,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha pogut iniciar el "
 "servei VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha trobat cap secret "
 "VPN vàlid."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -351,7 +375,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè els secrets VPN no són "
 "vàlids."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -360,7 +384,7 @@ msgstr ""
 "\n"
 "No s'ha pogut establir la connexió VPN «%s»."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -371,19 +395,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "S'ha establit correctament la connexió VPN.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Missatge d'entrada de la VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "No s'ha pogut establir la connexió VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -397,7 +421,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -410,563 +434,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "el dispositiu no està preparat (manca el microprogramari)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "el dispositiu no està preparat"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "no es gestiona el dispositiu"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "No hi ha cap dispositiu de xarxa disponible"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configura la VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "No s'està executant el NetworkManager..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la gestió de xarxes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Habilita la gestió de _xarxes"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Habilita el _sense fil"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Habilita la banda ampla _mòbil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Habilita les n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Edita les connexions..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Esteu connectat a «%s»."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "S'ha desconnectat la connexió de xarxa."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a «%s»..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "La connexió de xarxa «%s» és activa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "S'està iniciant la connexió VPN «%s»..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió VPN «%s»..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa VPN «%s»..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "La connexió VPN «%s» és activa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "El codi PUK no és correcte. Contacteu amb el vostre proveïdor."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "El codi PIN no és correcte. Contacteu amb el vostre proveïdor."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "S'està enviant el codi de desbloqueig..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ampla mòbil (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda ampla mòbil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Connexió de banda ampla mòbil nova"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "S'ha establit la connexió"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Esteu connectat a la xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Esteu registrat a la xarxa local."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Esteu registrat a una xarxa d'accés itinerant."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Esteu connectat a la xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "S'està preparant la connexió de banda ampla mòbil «%s»..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "S'està configurant la connexió de banda ampla mòbil «%s»..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Cal l'autenticació d'usuari per a la connexió de banda ampla mòbil «%s»..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "La connexió de banda ampla mòbil «%s» és activa"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automàtic"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Xarxes amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Xarxes amb fil"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Xarxa amb fil"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Esteu connectat a la xarxa amb fil."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa amb fil «%s»..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "S'està configurant la connexió de xarxa amb fil «%s»..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa amb fil «%s»..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa amb fil «%s»..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "La connexió de xarxa amb fil «%s» és activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticació DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "No s'ha pogut afegir una connexió nova"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Xarxes sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Xarxa sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Xarxa sense fil"
 msgstr[1] "Xarxes sense fil"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Les xarxes sense fil estan inhabilitades"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "L'interruptor de maquinari ha inhabilitat la xarxa sense fil"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Més xarxes"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Hi ha xarxes sense fil disponibles"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilitzeu el menú de xarxa per connectar-vos a una xarxa sense fil"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Esteu connectat a la xarxa sense fil «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "S'està preparant la connexió de xarxa sense fil «%s»..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "S'està configurant la connexió de xarxa sense fil «%s»..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Cal l'autenticació d'usuari per a la connexió de xarxa sense fil «%s»..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "S'està sol·licitant una adreça de xarxa sense fil per a «%s»..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "La connexió de xarxa sense fil «%s» és activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "La connexió de xarxa sense fil «%s» és activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinàmic"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adreces"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (predeterminat)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconeguda"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adreça de difusió"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Màscara de subxarxa"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primària:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Contrasenya _secundària:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfície"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adreça del maquinari"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguretat:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Ruta predeterminada"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorada"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipus de VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Passarel·la VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nom d'usuari de la VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Bàner de la VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Connexió base"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconeguda"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "No s'ha trobat cap connexió activa vàlida"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -974,18 +1022,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "i molts col·laboradors i traductors voluntaris"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicació per a l'àrea de notificació per gestionar els dispositius i "
 "les connexions de xarxa."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Lloc web del NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -993,33 +1045,33 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "necessaris (no s'ha trobat el fitxer d'interfície d'usuari)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Recursos que manquen"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Contrasenya de la xarxa de banda ampla mòbil"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1029,25 +1081,25 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Codi PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Mostra el codi PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1057,35 +1109,42 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Codi PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Codi PIN nou:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Torneu a introduir el codi PIN nou:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostra els codis 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Informació de la connexió"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "No s'ha pogut crear la connexió DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1094,41 +1153,41 @@ msgstr ""
 "Les adreces IP identifiquen el vostre ordinador a la xarxa. Feu clic al botó "
 "«Afig» per afegir una adreça IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nora les rutes obtingudes automàticament"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Utilitza esta connexió només per a recursos de la seua xarxa"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1136,16 +1195,16 @@ msgstr ""
 "Si s'habilita, esta connexió no s'utilitzarà mai com a connexió de xarxa "
 "predeterminada."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Crea..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Seleccioneu un tipus de connexió"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1157,85 +1216,100 @@ msgstr ""
 "Si voleu crear una connexió VPN i el tipus que voleu crear no apareix a la "
 "llista, és probable que no tingueu el connector VPN adequat instal·lat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Servei:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Reserva activa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Difusió"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Balanceig de càrrega de transmissió adaptativa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Balanceig de càrrega adaptatiu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomanat)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Connexions vinculades:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_ode:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Freqüència de seguiment:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Nom de la _interfície:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Seguiment de l'_enllaç:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Objectius ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1243,19 +1317,22 @@ msgstr ""
 "Una adreça IP, o una llista d'adreces IP separada per comes, que es "
 "comprovaran quan es comprovi l'estat de l'enllaç."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Retard de la _connexió:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Retard de la _desconnexió:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primària:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1263,105 +1340,163 @@ msgstr ""
 "El nom de la interfície del dispositiu primari. Si s'estableix, este "
 "dispositiu serà sempre l'esclau actiu quan estiga disponible."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Cost del camí:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritat:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Mode de _hairpin:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Connexions _puntejades:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Retard de _retransmissió:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Temps de «_Hello»:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Habilita la gestió de _xarxes"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Habilita l'STP (protocol d'arbre d'abast)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Edat _màxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Temps d'_envelliment:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automàtic"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predeterminat"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Habilita"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1372,198 +1507,237 @@ msgstr ""
 "adreça MAC com a adreça de maquinari. Este mètode es coneix com a "
 "falsejament d'identitat MAC. Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Nom de la interfície VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Adreça del maquinari:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Qualsevol dispositiu"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"No s'han pogut actualitzar els secrets de la connexió degut a un error "
-"desconegut."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Utilitza «Data Center Bridging» (DCB) per a esta connexió"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Control de flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Característica"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Habilita"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Anuncia"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Willing"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Opcions..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grups prioritaris"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Control de prioritat de flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Habilita o inhabilita la prioritat de transmissió en pausa per a cada "
 "prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioritat:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Classe de trànsit:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Amplada de banda estricta:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Amplada de banda prioritària:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Amplada de banda del grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Identificador de grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Introduïu l'identificador de grup de prioritat per cada prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1571,199 +1745,241 @@ msgstr ""
 "Introduïu l'ample de banda permés, en percentatge, que cada grup de "
 "prioritat utilitzarà. La suma de tots els grups ha d'ésser 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Introduïu el percentatge de l'ample de banda de prioritat de grup que cada "
 "prioritat d'usuari pot utilitzar."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Habilita o inhabilita l'ample de banda estricte per a cada prioritat "
 "d'usuari."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Introduïu la classe de trànsit per a cada prioritat d'usuari."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nom d'_usuari:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servei:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Most_ra la contrasenya"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Contrasenya:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfície"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfície _pare:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfície _pare:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Parell creuat (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Connector Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "Connector BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Connector Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Servei:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Adreça _MAC falsejada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Contrasenya de la clau _privada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Per defecte"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignora"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Difusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Contrasenya de la clau _privada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocitat:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1771,47 +1987,67 @@ msgid ""
 msgstr ""
 
 # FIXME (dpm)
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Dúple_x complet"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Connecta automàticament la _VPN quan s'utilitze esta connexió"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Cap"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Tots els _usuaris es poden connectar a esta xarxa"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Connecta't _automàticament a esta xarxa quan estiga disponible"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Connecta automàticament la _VPN quan s'utilitze esta connexió"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Informació de la connexió"
+msgid "Firewall _zone"
+msgstr "_Zona del tallafocs:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Connexions en _equip:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Ig_nora les rutes obtingudes automàticament"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Zona del tallafocs:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1820,7 +2056,7 @@ msgstr ""
 "Les adreces IP identifiquen el vostre ordinador a la xarxa. Feu clic al botó "
 "«Afig» per afegir una adreça IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1828,129 +2064,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automàtic, només adreces"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adreces"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Mode de _transport:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Mode de _transport:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Nom del dispositiu + número"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Cable"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Mode:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automàtic amb paràmetres manuals per al DNS"
 
 # http://en.wikipedia.org/wiki/Link-local_address (dpm)
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Connexió 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Compartit a altres ordinadors"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Mètode:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1961,8 +2201,8 @@ msgstr ""
 "vostre ordinador a l'administrador de la xarxa. Si voleu utilitzar un "
 "identificador de client DHCP, introduïu-lo ací."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1970,25 +2210,26 @@ msgstr ""
 "Dominis utilitzats en resoldre els noms d'amfitrió. Utilitzeu la coma per "
 "separar múltiples dominis."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "Identificador del client de D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Dominis de cerca:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Servidors _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1997,11 +2238,11 @@ msgstr ""
 "d'amfitrió. Utilitzeu la coma per separar múltiples adreces de servidor de "
 "nom de domini."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Cal l'adreçament IPv_4 per completar la connexió"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2009,25 +2250,35 @@ msgstr ""
 "Quan es connecte a xarxes IPv6, permet completar la connexió per IPv6 en cas "
 "que la configuració IPv4 falle."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rutes..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Inhabilitada"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Habilitat (prefereix una adreça pública)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Habilitat (prefereix una adreça temporal)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Habilita"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2038,15 +2289,20 @@ msgstr ""
 "de nom de domini. Les adreces «Link-local» s'inclouran a l'àmbit de la "
 "interfície de connexió."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Extensions de _privacitat d'IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Cal l'adreçament IPv_6 per completar la connexió"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2054,756 +2310,862 @@ msgstr ""
 "Quan es connecte a xarxes IPv4, permet completar la connexió per IPv4 en cas "
 "que la configuració IPv6 falle."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Mètrica"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nú_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Identificador de xar_xa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Canvia..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permet la _itinerància si la xarxa domèstica no està disponible"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Mo_stra les contrasenyes"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autenticació"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Mètodes admesos:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configuració dels _mètodes..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compressió"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Utilitza l'encriptació punt a punt (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Cal l'encriptació de 128 bits"
 
 # FIXME (dpm)
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Utilitza l'MPPE amb _estat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permet la compressió _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permet la compressió _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Utilitza la compressió de les _capçaleres TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eco"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Envia paquets d'_eco de PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Mètode:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Cap"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Importa una configuració en equip des d'un fitxer..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Mètode:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avançat"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Xarxes amb fil"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioritat:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioritat:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioritat:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Clau _privada:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Retard de la _connexió:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Retard de la _desconnexió:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interfície _pare:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Objectius ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Objectius ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Importa una configuració en equip des d'un fitxer..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Configuració _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Amplada de banda del grup:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioritat"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Cable"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Connexions en _equip:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cable"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Adreça del maquinari:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Adreça del maquinari:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioritat:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Po_tència de transmissió:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Po_tència de transmissió:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Interfície _pare:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Nom de la interfície VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Adreça _MAC falsejada:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_Identificador de la VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Nom del dispositiu + número"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "«vlan» + número"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Seguretat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Po_tència de transmissió:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Velocitat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Mètodes d'autenticació admesos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Protocol d'autenticació extensible"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protocol d'autenticació per contrasenya"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu de Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Protocol d'autenticació per desafiament mutu de Microsoft, versió 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2813,111 +3175,99 @@ msgstr ""
 "mètodes d'autenticació. En cas que fallen les connexions, intenteu "
 "inhabilitar-ne alguns."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Vinculada"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equip"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"El connector VPN no ha pogut importar la connexió VPN correctament\n"
-"\n"
-"Error: no hi ha cap tipus de servei VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "No es pot importar la connexió VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"No s'ha pogut llegir el fitxer «%s» o bé no conté cap informació de connexió "
-"VPN que es puga reconèixer\n"
+"El connector VPN no ha pogut importar la connexió VPN correctament\n"
 "\n"
-"Error: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Error desconegut"
+"Error: no hi ha cap tipus de servei VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Seleccioneu el fitxer a importar"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Importa una configuració VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2925,79 +3275,86 @@ msgstr ""
 "No s'ha pogut inicialitzar el diàleg d'edició de les connexions a causa d'un "
 "error desconegut."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "No s'ha pogut crear la connexió nova"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "No s'ha pogut suprimir la connexió"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Segur que voleu suprimir la connexió %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Connexions _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Màscara de xarxa"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Passarel·la"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Mètrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "S'està editant %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "S'està editant la connexió sense nom"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nom de la connexió:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "S'ha produït un error en inicialitzar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "No s'ha pogut afegir la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3005,57 +3362,54 @@ msgstr ""
 "L'editor de connexions no ha pogut trobar alguns dels recursos necessaris "
 "(no s'ha trobat el fitxer d'interfície d'usuari)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Al_ça"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Guarda els canvis fets a la connexió."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiqueu-vos per guardar la connexió per a tots els usuaris de "
 "l'ordinador."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "No s'ha pogut crear la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "No s'ha pogut editar la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "S'ha produït un error desconegut en crear el diàleg de l'editor de "
 "connexions."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "S'ha produït un error en inicialitzar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "No s'ha pogut afegir la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3064,201 +3418,247 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en l'autenticació EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nom de la connexió:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_xporta..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "mai"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ara"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa %d minut"
 msgstr[1] "fa %d minuts"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa %d hora"
 msgstr[1] "fa %d hores"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa %d dia"
 msgstr[1] "fa %d dies"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa %d mes"
 msgstr[1] "fa %d mesos"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "fa %d any"
 msgstr[1] "fa %d anys"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "No s'ha pogut afegir la connexió"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Connexió en equip %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Connexió en equip %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Utilitzada per última vegada"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Edita la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiqueu-vos per editar la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Suprimeix la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiqueu-vos per suprimir la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "No s'admet el tipus de connexió de banda ampla mòbil."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Es desconeix com crear connexions «%s»"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "S'ha produït un error en editar la connexió"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "No s'ha pogut afegir la connexió"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "No hi ha cap connector VPN instal·lat."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Es desconeix com crear connexions «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "S'ha produït un error en editar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "No s'ha pogut trobar cap connexió amb UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Connexions de xarxa"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Connexions _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguretat 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Utilitza la seguretat 802.1_X per a esta connexió"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari DCB."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Connexió vinculada %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Xarxa amb fil"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Xarxa sense fil"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió vinculada."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Primària:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexió vinculada %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per la connexió de pont."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexió de pont %d"
@@ -3266,32 +3666,37 @@ msgstr "Connexió de pont %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port del pont"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de ponts de port."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfície _pare:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexió DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3301,45 +3706,44 @@ msgstr ""
 "L'opció bloqueja la connexió al dispositiu de xarxa especificat per l'adreça "
 "MAC. Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorada"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió amb fil."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Cable"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Adreça _MAC falsejada:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexió de xarxa amb fil %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Per defecte"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3349,11 +3753,11 @@ msgstr ""
 "una zona regular, si la seleccioneu el tallafocs utilitzarà la zona per "
 "defecte. Només és útil si el firewallD està actiu."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari general."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3364,160 +3768,164 @@ msgstr ""
 "L'opció bloqueja la connexió al dispositiu de xarxa especificat per l'adreça "
 "MAC. Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexió InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Connexió de xarxa amb fil %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automàtic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Només adreces (VPN) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automàtic, només adreces"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automàtic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Només adreces (PPPoE) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automàtic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Només adreces (DHCP) automàtiques"
 
 # http://en.wikipedia.org/wiki/Link-local_address (dpm)
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Només adreces de connexió local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Servidors _DNS addicionals:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dominis de _cerca addicionals:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Edició de les rutes IPv4 per a %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Paràmetres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automàtic, només DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Edició de les rutes IPv6 per a %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Paràmetres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Connexió WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Duplica els esclaus"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Els esclaus «%s» i «%s» s'apliquen tots dos al dispositiu «%s»"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3526,27 +3934,27 @@ msgstr ""
 "Els esclaus «%s» i «%s» s'apliquen a diferents ports virtuals («%s» i «%s») "
 "del mateix dispositiu físic."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclava %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió de banda "
 "ampla mòbil."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "No s'admet el tipus de connexió de banda ampla mòbil."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccioneu el tipus de proveïdor de banda ampla mòbil"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3555,7 +3963,7 @@ msgstr ""
 "Seleccioneu la tecnologia que utilitza el vostre proveïdor de banda ampla "
 "mòbil. Si no n'esteu segur, demaneu-ho al vostre proveïdor."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en _GSM (és a dir, GPRS, EDGE, "
@@ -3563,86 +3971,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "cap"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Edició dels mètodes d'autenticació PPP per a %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Paràmetres PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió vinculada."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Error: el fitxer no conté una configuració JSON vàlida"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari de l'equip."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexió en equip %d"
@@ -3650,69 +4054,69 @@ msgstr "Connexió en equip %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port de l'equip"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari del port de l'equip."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VLAN."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexió VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "No s'ha trobat cap servei de connector VPN per a «%s»."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "No s'ha trobat cap servei de connector VPN per a «%s»."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Ha fallat la connexió"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "No s'ha trobat cap servei de connector VPN per a «%s»."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexió VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccioneu un tipus de connexió VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3723,7 +4127,7 @@ msgstr ""
 "el tipus de connexió VPN que voleu crear no apareix a la llista, és probable "
 "que no tingueu el connector VPN adequat instal·lat."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3732,7 +4136,7 @@ msgstr ""
 "Esta opció bloqueja la connexió al punt d'accés sense fil (AP) especificat "
 "per l'identificador BSSID.  Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3742,99 +4146,97 @@ msgstr ""
 "L'opció bloqueja la connexió al dispositiu de xarxa especificat per l'adreça "
 "MAC. Exemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la connexió sense fil."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Qualsevol dispositiu"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP de 40/128 bits (Hex o ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Contrasenya WEP de 128 bits"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinàmic 802.1X"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de la "
 "connexió sense fil. Manca un paràmetre de la connexió sense fil."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Seguretat de la xarxa sense fil"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "No s'ha pogut carregar la interfície d'usuari per a la seguretat de la "
 "connexió sense fil."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Ja existeix un fitxer anomenat «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Voleu reemplaçar %s per la connexió VPN que esteu guardant?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "No es pot exportar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3845,224 +4247,106 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Exporta una connexió VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desbloqueja"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Desbloqueja automàticament este dispositiu"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informació de la connexió"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Connexions de xarxa actives"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "No es _requereix cap certificat de CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Trieu el vostre certificat personal..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Clau _privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Contrasenya de la clau _privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Trieu el vostre certificat personal..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Certificat de l'_usuari:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"La connexió de banda ampla mòbil està configurada amb els paràmetres "
-"següents:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "El dispositiu:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "El proveïdor:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "El pla:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
-"els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
-"accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
-"voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
-"l'entrada «Connexions de xarxa» del menú Sistema >> Preferències."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "El meu país no és a la llista"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "No és a la llista"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Seleccioneu el vostre pla:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
-"facturació del compte de banda ampla o que no vos pugueu connectar.\n"
-"\n"
-"Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que vos "
-"n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Seleccioneu el pla de facturació"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "No és a la llista..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Seleccioneu el proveïdor des d'una _llista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveïdor"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Proveïdor:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Trieu el proveïdor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Llista de països o regions:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País o regió"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "El meu país no és a la llista"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Trieu el país o regió del vostre proveïdor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositiu GSM instal·lat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositiu CDMA instal·lat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Qualsevol dispositiu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Connexió de banda ampla mòbil nova"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4070,191 +4354,272 @@ msgstr ""
 "L'auxiliar vos ajudarà a configurar una connexió de banda ampla mòbil a una "
 "xarxa cel·lular (3G) de manera fàcil."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vos caldrà la informació següent:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "El nom del proveïdor de banda ampla"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "El nom del pla de facturació de banda ampla"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "L'APN (Access Point Name - nom del punt d'accés) del vostre pla de "
 "facturació de banda ampla (només en alguns casos)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Qualsevol dispositiu"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configura una connexió de banda ampla mòbil"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Connexió de banda ampla mòbil nova"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o regió"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Trieu el país o regió del vostre proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Seleccioneu el proveïdor des d'una _llista:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "El proveïdor utilitza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "El proveïdor utilitza tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Trieu el proveïdor"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Seleccioneu el vostre pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name - nom del punt d'accés) del pla seleccionat:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Avís: si seleccioneu un pla incorrecte, pot ser que tingueu problemes de "
+"facturació del compte de banda ampla o que no vos pugueu connectar.\n"
+"\n"
+"Si no esteu segur de quin és el vostre pla, demaneu al proveïdor que vos "
+"n'indiqui l'APN («Access Point Name», nom del punt d'accés)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Seleccioneu el pla de facturació"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"La connexió de banda ampla mòbil està configurada amb els paràmetres "
+"següents:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "El dispositiu:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "El proveïdor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "El pla:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Es durà a terme una connexió al proveïdor de banda ampla mòbil utilitzant "
+"els paràmetres que heu seleccionat. Si no es pot connectar o bé no podeu "
+"accedir als recursos de la xarxa, torneu a comprovar els paràmetres. Si "
+"voleu modificar els paràmetres de la connexió de banda ampla mòbil, trieu "
+"l'entrada «Connexions de xarxa» del menú Sistema >> Preferències."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmeu els paràmetres de la banda ampla mòbil"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(cap)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificat de C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Desconeguda"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Trieu el vostre certificat personal..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Certificat de l'_usuari:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "S'ha produït un error en editar la connexió"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Desbloqueja"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Guarda la contrasenya només per este _usuari"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Guarda la contrasenya per tots els usu_aris"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Demana la contrasenya cada vegada"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "Contrasenya _secundària:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "M_ostra les contrasenyes"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "Contrasenya _secundària:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "M_ostra les contrasenyes"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Contrasenya _secundària:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Desconnecta"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinàmic 802.1X"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4262,35 +4627,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Introduïu el nom de la xarxa sense fil que voleu crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4298,35 +4663,55 @@ msgstr ""
 "Introduïu el nom i els paràmetres de seguretat de la xarxa sense fil oculta "
 "a la qual vos vulgueu connectar."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Seguretat de la _xarxa sense fil:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nnexió:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Adaptador sense fil:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "No hi ha el proveïdor i vull introduir-lo _manualment:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Proveïdor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Llista de països o regions:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País o regió"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Amb fil"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malla d'OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4336,17 +4721,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Seguretat de la _xarxa sense fil:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nom de _xarxa:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexió:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador sense fil:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Ús:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4354,7 +4761,7 @@ msgstr ""
 "Este programa és un component del NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4362,413 +4769,482 @@ msgstr ""
 "No es pretén que hi interaccioneu des de la línia d'ordes, sinó que "
 "s'executa en l'entorn d'escriptori GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "no està habilitat"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no està registrat"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Xarxa domèstica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Xarxa domèstica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "s'està cercant"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "s'ha denegat el registre"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s itinerant)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (itinerant)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Xarxa itinerant (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Xarxa itinerant"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Codi PIN per la targeta SIM «%s» a «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Cal que introduïu el codi PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cal que introduïu un codi PIN per al dispositiu de banda ampla mòbil"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "La connexió de banda ampla mòbil «%s» és activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "itinerància"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "connexió de %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "No es _requereix cap certificat de CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Seleccioneu un fitxer PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anònim"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticat"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ambdós"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identitat anòni_ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Fitxer _PAC:"
 
 # FIXME: (dpm)
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Autenticació i_nterna:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Trieu un certificat d'autoritat de certificació (CA)..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versió 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versió 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificat de C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "No es _requereix cap certificat de CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Versió del _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Contrasenya WEP de 128 bits"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "M_ostra les contrasenyes"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "No es _requereix cap certificat de CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "No es _requereix cap certificat de CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentitat:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS per túnel"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Autenticació:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (predeterminat)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema obert"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (predeterminat)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Clau:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Most_ra la clau"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Índe_x WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipus:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (predeterminat)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorada"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "No s'han pogut actualitzar els secrets de la connexió degut a un error "
+#~ "desconegut."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritat:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Connecta't _automàticament a esta xarxa quan estiga disponible"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Informació de la connexió"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "No es pot importar la connexió VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "No s'ha pogut llegir el fitxer «%s» o bé no conté cap informació de "
+#~ "connexió VPN que es puga reconèixer\n"
+#~ "\n"
+#~ "Error: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Error desconegut"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Trieu un certificat d'autoritat de certificació (CA)..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Certificat de C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Miniaplicació NetworkManager"
@@ -4802,30 +5278,6 @@ msgstr "_Tipus:"
 #~ 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"
 
@@ -5054,13 +5506,6 @@ msgstr "_Tipus:"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "La propietat «%s» / «%s» no és vàlida: %d"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr ""
-#~ "No s'ha pogut carregar la interfície d'usuari per a la connexió WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Connexió WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5084,9 +5529,6 @@ msgstr "_Tipus:"
 #~ msgid "Error: %s"
 #~ msgstr "Error: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "No s'ha pogut crear la connexió DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Ja podeu utilitzar el telèfon."
 
diff --git a/po/crh.po b/po/crh.po
index 41411c23..3fb7cdba 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nm-aplet 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-05-21 18:21-0500\n"
 "Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
 "Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-meydan@lists."
@@ -21,50 +22,59 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-04-23 03:00+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Şebeke"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Şebeke bağlantılarıñıznı idare etiñiz"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Şebeke Bağlantıları"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Yeni Yapılandırma Oluşturuldu"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Şebeke bağlantısı tesbitleriñizni idare etiñiz ve değiştiriñiz"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Bağlanuv bildirimlerini ğayrı qabilleştir"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Bir şebekege bağlanğanda bildirimlerni ğayriqabilleştirmek içün bunı \"doğru"
 "\"ğa tesbit etiñiz."
 
 # tüklü
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Bağlantı qoparılğan bildirimlerini ğayrıqabilleştir"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Bir şebekege bağlantını qoparğanda bildirimlerni ğayrıqabilleştirmek içün "
 "bunı \"doğru\"ğa tesbit etiñiz."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN bildirimlerini ğayrıqabilleştir"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -72,190 +82,204 @@ msgstr ""
 "Bir VPN'ge bağlanğanda yaki bağlantısını qoparğanda bildirimlerni "
 "ğayrıqabilleştirmek içün bunı \"doğru\"ğa tesbit etiñiz."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Şebekeler faydalanılabilir bildirimlerini bastırıqla"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Telsiz-Vefa şebekeler faydalanışlı olğanda bildirimlerni ğayrıqabilleştirmek "
 "içün bunı \"doğru\"ğa tesbit etiñiz."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Mühür"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Ayarlarnıñ yañı bir sürümge köçürilmek kerek olıp olmağanını belgilemek içün "
 "qullanılır."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi (Telsiz Vefa) İcat Et Ğayrı Qabilleştirilsin"
 
 # tüklü
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Uyğulamaçıqnı qullanğanda tek-vaziyetli (adhoc) şebekelerniñ icadını "
 "ğayrıqabilleştirmek içün \"doğru\"ğa tesbit etiñiz."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Uyğulamaçıqnı tebliğ mıntıqasında köster"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Uyğulamaçıqnıñ tebliğ mıntıqasında kösterilmesini naqabilleştirmek içün "
 "\"FALSE\" (yañlış) olaraq tesbit etiñiz."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Şebeke İdarecisi"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Şebeke bağlantısı yok"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager Uygulamacığı"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X sahihlenimi"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Bağlan"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Şebeke _adı:"
 
 # tüklü
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "bunıñ-içün"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "emniyetli."
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Bağlantı eklenamadı/faalleştirilamadı"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Bilinmegen hata"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Bağlantı muvaffaqiyetsizligi"
 
 # tüklü
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Cihaz bağlantısı qoparılması muvaffaqiyetsiz edi"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Bağlantını qoparma muvaffaqiyetsizligi"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Bağlantı faalleştirilmesi muvaffaqiyetsiz edi"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Bu mesajı tekrar gösterme"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "VPN bağlantısı '%s' qoparıldı çünki şebeke bağlantısı inqıtağa oğradı."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "'%s'  VPN bağlantısı başarısız oldu çünkü şebeke bağlantısı engellendi."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -285,7 +309,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN servisi beklenmedik bir anda "
 "durmuş."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN servisi geçersiz ayarlara geri "
 "dönmüş."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu. Bağlanma denemesi zaman aşımına uğradı."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu. VPN hizmeti zamanında başlamadı."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu çünkü  VPN hizmeti başlatılamadı."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu. Geçerli VPN güvenlikleri yok."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı geçersiz VPN güvenliklerinden dolayı başarısız oldu."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -350,7 +374,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -358,19 +382,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN Oturum Açılış İletisi"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN Bağlantısı Başarısız"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -383,7 +407,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -397,571 +421,596 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "cihaz hazır degil (bellenim eksik)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "cihaz hazır degil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "bağlanmağan"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Bağlantını qopar"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "aygıt kullanılamadı"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Şebeke aygıtı bulunamıyor"
 
 # tüklü
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN Bağlantıları"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_VPN Yapılandır..."
 
 # tüklü
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN Bağlantıları"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Şebeke Yöneticisi çalışmıyor..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Şebeke etkin değil"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Şebekelemeni Qabilleştir"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Telsiz-Vefanı Qabilleştir"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil Kenişbant Qabil Olsun"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Bildirimler Qabil Olsun"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Bağlantı _Malümatı"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Bağlantılarnı Tahrir Et..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Haqqında"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Şimdi '%s' şebekesine bağlanğan olasıñız."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Bağlanmağan"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Şebeke bağlantısı qoparılğandır."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Şebeke bağlantısı hazırlana '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Şebeke bağlantısı için kullanıcı doğrulaması gerekli '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' içün bir şebeke adresi rica etile..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Şebeke bağlantısı '%s' etkin"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN bağlantısı başlatılıyor '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN bağlantısı için kullanıcı doğrulaması gerekli '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' için bir VPN adresi isteniyor..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN bağlantısı '%s' etkin"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Şebeke bağlantısı yok"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Uygulamacığı"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 "Yañlış PUK (PİN Kilitsizleme Anahtarı; PKA) kodu; lütfen teminatçıñız ile "
 "temas etiñiz."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 "Yañlış PİN (ŞKN; Şahsiy Kimlik Nomerası) kodu; lütfen teminatçıñız ile temas "
 "etiñiz."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Kilitsizleme kodu yiberile..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobil Kenişbant (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobil Kenişbant"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Faydalanışlı"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Yañı Mobil Keniş-bant Bağlantısı"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Bağlantı Tesis Etildi"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Şimdi Mobil Kenişbant şebekege bağlanğan olasıñız."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobil Kenişbant şebekesi."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Şimdi ev şebekesine qaydlısıñız."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Şimdi bir kezeleme şebekesine qaydlısıñız."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Şimdi mobil kenişbant şebekege bağlanğan olasıñız."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Mobil keniş-bant bağlantısı hazırlana '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mobil genişbant bağlantısı yapılandırlıyor '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "'%s' mobil genişbant bağlantısı için kullanıcı doğrulaması gerekli..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobil kenişbant bağlantısı '%s' faal"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Oto Eternet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Kabelli (Ethernet) Şebekeler (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Kabelli (Ethernet) Şebeke (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Kabelli (Ethernet) Şebekeler"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Kabelli (Ethernet) Şebeke"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Şimdi kabelli (ethernet) şebekege bağlanğan olasıñız."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "'%s' kabelli (ethernet) şebeke bağlantısı hazırlana..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Kabelli (ethernet) şebeke bağlantısı '%s' endamlandırıla..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Kabelli (ethernet) şebeke bağlantısı '%s' içün qullanıcı sahihlenimi "
 "şarttır..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' içün kabelli (ethernet) şebeke adresi istene..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Kabelli (Ethernet) şebeke bağlantısı '%s' faal"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL doğrulaması"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Yañı bağlantı eklenamadı"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Telsiz-Vefa Şebekeler (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Telsiz-Vefa Şebeke (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Telsiz-Vefa Şebeke(ler)"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Telsiz-Vefa naqabildir"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Telsiz-Vefa donanım almaştırıcısı ile ğayrıqabilleştirilgen"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Daa çoq şebeke"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Telsiz-Vefa Şebekeler Müsait"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Bir Telsiz-Vefa şebekege bağlanmaq içün şebeke menüsini qullanıñız"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Şimdi '%s' Telsiz-Vefa şebekesine bağlanğan olasıñız."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' hazırlana..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' endamlandırıla..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Telsiz-Vefa şebeke bağlantısı '%s' içün qullanıcı sahihlenimi şarttır..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' içün bir Telsiz-Vefa şebeke adresi rica etile..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' faal: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' faal"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Bağlantısı faalleştirilamadı"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Bağlantı bilgisini gösterirken hata:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamik WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresler"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Hiç biri"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (ögbelgilengen)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Namalüm"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Namalüm"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "İP Adresi"
 
 # tüklü
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Yayın Adresi"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Namalüm"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Alt-şebeke Maskası"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Birlemci DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Ekilemci DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Üçlemci DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eternet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Umumiy"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Arayüz"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Donanım Adresi"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Sürüci"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Sur'at"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Emniyet:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Öntanımlı Rota"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "İhmal Etilgen"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Sır-söz:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN Türu"
 
 # tüklü
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN Savağı"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN Qullanıcı Adı"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN Afişi"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Temel Bağlantı"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Geçerli etkin bağlantı bulunamadı!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -969,19 +1018,27 @@ msgstr ""
 "Telif Hakkı © 2005-2008 Novell, Inc.\n"
 "ve çoq diger toplulıq hisse qoşucıları ve tercimeciler"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Şebeke cihazlarıñız ve bağlantılarıñıznı idare etüv içün bildirim mıntıqası "
 "uyğulamaçığı."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager Web sitesi"
 
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"Reşat SABIQ <tilde.birlik@gmail.com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Reşat SABIQ https://launchpad.net/~tilde-birlik"
+
 # tr
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -989,37 +1046,37 @@ msgstr ""
 "NetworkManager Uygulamacığı bazı gerekli kaynakları bulamadı (.ui dosyası "
 "bulunamadı)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Kaybolan kaynaklar"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobil genişbant şebeke parolası"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' ağına bağlanmak için parola gerekli."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Sır-söz:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 "SİM (Abuneci Kimlik Modüli; AKM) PİN (Şahsiy Kimlik Nomerası; ŞKN) "
 "kilitsizleme şart"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 "SİM (Abuneci Kimlik Modüli; AKM) PİN (Şahsiy Kimlik Nomerası; ŞKN) "
 "Kilitsizleme Şart"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1029,29 +1086,29 @@ msgstr ""
 "Modüli; AKM) PİN (Şahsiy Kimlik Nomerası; ŞKN) kodunı şart qoya"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PİN kodu:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PİN kodunı köster"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 "SİM (Abuneci Kimlik Modüli; AKM) PUK (PİN Kilitsizleme Anahtarı; PKA) "
 "kilitsizleme şart"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 "SİM (Abuneci Kimlik Modüli; AKM) PUK (PİN Kilitsizleme Anahtarı; PKA) "
 "Lilitsizleme Şart"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1061,35 +1118,42 @@ msgstr ""
 "Modüli; AKM) PUK (PİN Kilitsizleme Anahtarı; PKA) kodunı şart qoya"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kodu:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Yañı PİN kodu:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Yañı PİN kodunı kene kirsetiñiz:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PİN/PUK kodlarını köster"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Bağlantı Malümatı"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN bağlantısı icat etilamadı: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1098,42 +1162,42 @@ msgstr ""
 "İP adresleri bilgisayarıñıznı şebeke üzerinde kimliklendirirler.  Bir İP "
 "adresini eklemek içün \"Ekle\" dögmesine çertiñiz."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Sil"
 
 # tüklü
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Öz-özünden elde etilgen marşrutlarnı _ihmal et"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Bu bağlantını ancaq şebekesi üzerindeki qaynaqlar içün qullan"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1141,16 +1205,16 @@ msgstr ""
 "Etkinleştirilirse, bu bağlantı asla öntanımlı şebeke bağlantısı olarak "
 "kullanılamayacak."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "İcat Et…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Bir Bağlantı Türü Saylañız"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1162,212 +1226,277 @@ msgstr ""
 "Bir VPN icat ete iseñiz ve icat etmege istegeniñiz VPN bağlantısı listede "
 "körünmey ise, belki de qurulğan doğru VPN plaginiñiz yoq."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Hızmet:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Yayın"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
-msgstr ""
+# tüklü
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
+msgstr "Köpürlengen _bağlantılar:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "K_ip:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Tahrir Et"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Arayüz _ismi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Birlemci DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bayt"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Köpürlengen _bağlantılar:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Şebekelemeni Qabilleştir"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "otomatik"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "öntanımlı"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "_Telsiz-Vefanı Qabilleştir"
 
 # tüklü
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1378,444 +1507,540 @@ msgstr ""
 "olarak kullanılacak. Bu özellik MAC çoklama ya da aldatma olarak bilinir. "
 "Örnek: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adres"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adres"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "Arayüz _ismi:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Donanım Adresi:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Her hangi cihaz"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Bilinmegen bir hatadan dolayı bağlantı sırları yañartılamadı."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Bu bağlantı içün 802.1X emniyetini qullan"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "_Telsiz-Vefanı Qabilleştir"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_Evveliyet:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Qullanıcı adı:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Hızmet:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Sır-sözni _köster"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Parola:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Arayüz"
+
+# tüklü
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Baba arayüz:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+# tüklü
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Baba arayüz:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Qayırılğan Çift (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "İlişik Birlemi Arayüzü (İBA; AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Vasattan Bağımsız Arayüz (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "İhmal Et"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Elle"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Hızmet:"
+msgid "_Port"
+msgstr "_Port:"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "_Klonlanğan MAC adresi:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Hususiy anahtar sır-sözü:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Ögbelgileme"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "İhmal Et"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Yayın"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Hususiy anahtar sır-sözü:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Sur'at:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Tam çift _yönlü"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 ""
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Ebet"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Hayır"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Bu şebekege qullanıcı_larnıñ hepsi bağlanabilir"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Bu cihaznı avtomatik olaraq kilitsizle"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+# tüklü
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Bağlantı _Malümatı"
+msgid "_Metered connection"
+msgstr "Köpürlengen _bağlantılar:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Öz-özünden _bağlan"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1824,7 +2049,7 @@ msgstr ""
 "İP adresleri bilgisayarıñıznı şebeke üzerinde kimliklendirirler.  Bir İP "
 "adresini eklemek içün \"Ekle\" dögmesine çertiñiz."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1832,130 +2057,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Avtomatik, faqat adresler"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresler"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Bağlanılğan"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Hızmet:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Eternet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Tarz:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Avtomatik, elnen ayarlanğan DNS ile"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "İlişim-Yerli"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Diger bilgisayarlarğa üleşimli"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Usul:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1966,8 +2194,8 @@ msgstr ""
 "şahsiyleştirmege izin berir. Bir DHCP müşterisi kimligini qullanmağa "
 "isteseñiz, onı mında kirsetiñiz."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1975,26 +2203,27 @@ msgstr ""
 "Qonaqbay adlarını çezgende qullanılğan sahalar. Müteaddit sahanı ayırmaq "
 "içün virgüllerni qullanıñız."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP müşteri kimligi:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Sahalarnı qıdır:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS sunucıları:"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2003,12 +2232,12 @@ msgstr ""
 "adresleri. Müteaddit saha adı sunucısı adreslerini ayırmaq içün virgüllerni "
 "qullanıñız."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Bu bağlantınıñ tamamlanması içün IPv_4 adreslemesini zarur yap"
 
 # tr
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2016,26 +2245,36 @@ msgstr ""
 "IPv6 uyumlu ağlara bağlandığında, IPv6 yapılandırması çalışıp IPv4 "
 "yapılandırması çalışmadığında bağlantının tamamlanmasına izin verir."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Marşrutlar…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Ğayrıqabilleştirilgen"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "_Telsiz-Vefanı Qabilleştir"
+
 # tüklü
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2046,16 +2285,20 @@ msgstr ""
 "adresleri. Müteaddit saha adı sunucısı adreslerini ayırmaq içün virgüllerni "
 "qullanıñız."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Bu bağlantınıñ tamamlanması içün IPv_6 adreslemesini zarur yap"
 
 # tr
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2063,764 +2306,870 @@ msgstr ""
 "IPv6 uyumlu ağlara bağlandığında, IPv6 yapılandırması çalışıp IPv4 "
 "yapılandırması çalışmadığında bağlantının tamamlanmasına izin verir."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Ölçü"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_İthal Et"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Temel"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Nomera:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "İleriletilgen"
 
 # tüklü
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_Şebeke Kimligi:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Deñiştir..."
 
 # tüklü
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Ev şebekesi müsait degil ise _kezelemege izin ber"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Sır-sözlerni _köster"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Sahihlenim"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Caiz usullar:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "_Usullarnı Ayarla..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Sıqıştırma"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Noqtadan-noqtağa şifrelendirme (MPPE) qullan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-bit şifrelendirme şart _olsun"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_Durumlı MPPE qullan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD veriler sıqıştırmasına izin ber"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "\"_Deflate\" veriler sıqıştırmasına izin ber"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP _başlıq sıqıştırmasını qullan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Akisseda"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP _akisseda paketlerini yiber"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Usul:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Hiç biri"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "Usul:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "İleriletilgen"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Kabelli (Ethernet) Şebekeler"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Evveliyet:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Hususiy _anahtar:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Baba arayüz:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "Yeni Yapılandırma Oluşturuldu"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "Yeni Yapılandırma Oluşturuldu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Eternet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Köpürlengen _bağlantılar:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eternet"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Donanım Adresi:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Donanım Adresi:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Evveliyet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Gönderim gü_cü:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Gönderim gü_cü:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
 # tüklü
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Baba arayüz:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "Arayüz _ismi:"
 
 # tüklü
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Klonlanğan MAC adresi:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Emniyet:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
 # tüklü
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc (Halükârğa mahsus)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Gönderim gü_cü:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Nisbet:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "k_anal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_t:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 #, fuzzy
 msgid "No polkit authorization to perform the action"
 msgstr "PolicyKit doğrulaması oluşturulamadı."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Caiz Sahihlenim Usulları"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
 # tüklü
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Uzatılabilir Sahihlenüv Protokolı"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Parola Doğrulaması Protokolü"
 
 # tüklü
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Doğrulama Protokolü"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Doğrulama Protokolü"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP sürüm _2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Doğrulama Protokolü sürüm 2"
 
 # tr
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2830,190 +3179,187 @@ msgstr ""
 "destekleyecektir. Eğer bağlantı sağlanamazsa, bazı yöntemler için desteği "
 "devre dışı bırakmayı deneyin."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Telsiz-Vefa"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Köpür"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN eklentisi, VPN bağlantıyı içe aktarmada başarısız oldu.\n"
-"\n"
-"Hata: VPN hizmeti türü yok."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN bağlantısı içe aktarılamıyor"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"'%s' dosyası okunamadı ya da tanınan VPN bağlantı bilgisini içermiyor.\n"
+"VPN eklentisi, VPN bağlantıyı içe aktarmada başarısız oldu.\n"
 "\n"
-"Hata: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Bilinmegen hata"
+"Hata: VPN hizmeti türü yok."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "İçe aktarılacak dosyayı seç"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Bağlantı muharriri bilinmegen bir hatadan dolayı başlanğıçlandırılamadı."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Yañı bağlantı icat etilamadı"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Bağlantı silinamadı"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s bağlantısını silmek istediğinize emin misiniz?"
 
-#: ../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
+# tüklü
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN Bağlantıları"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Şebeke maskası"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Veri yolu"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Ölçü"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Ög-yalğama"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s Tahrir Etile"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Ad-sız bağlantı düzenleniyor"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Bağlantı _adı:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Muharrirni başlanğıçlandırğanda hata"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Bağlantı eklev muvafaqiyetsiz"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
 # tr
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3021,249 +3367,293 @@ msgstr ""
 "Bağlantı düzenleyici bazı gerekli kaynakları bulamadı ( .ui dosyası "
 "bulunamadı)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Saqla"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Bu bağlantığa yapılğan her hangi deñişikliklerni saqla."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Bu makinenin tüm kullanıcıları için bağlantı doğrulamasını kaydedin."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Bağlantı icat etilamadı"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Bağlantı tahrir etilamadı"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Bağlantı muharriri dialogı icat etilgende namalüm hata."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Muharrirni başlanğıçlandırğanda hata"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Bağlantı eklev muvafaqiyetsiz"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Bağlantı _adı:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "İh_raç Et"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "etiket"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "etiket"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "asla"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "şimdi"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d daqqa evel"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d saat önce"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d kün evel"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ay evel"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d yıl evel"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Bağlantı eklev muvafaqiyetsiz"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Telli bağlantı %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Telli bağlantı %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "İsim"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Soñki Qullanılğan"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Saylanğan bağlantını tahrir et"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Saylanğan bağlantını tahrir etmek içün sahihleniñiz"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Saylanğan bağlantını sil"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Saylanğan bağlantını silmek içün sahihleniñiz"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Desteklenmegen mobil keniş-bant bağlantı türü."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "'%s' bağlantılarınıñ nasıl icat etilgenini bilmeyim"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Bağlantını tahrir etkende hata"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Bağlantını icat etkende hata"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Bağlantı eklev muvafaqiyetsiz"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' bağlantılarınıñ nasıl icat etilgenini bilmeyim"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Bağlantını tahrir etkende hata"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' ile bir bağlantı tapılmadı."
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Şebeke Bağlantıları"
+
+# tüklü
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN Bağlantıları"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X Emniyeti"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X Emniyet qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Bu bağlantı içün 802.1_X emniyetini qullan"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Eternet qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "Bluetooth cihazı tapılamadı."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Telli bağlantı %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 #, fuzzy
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Saylanğan bağlantını sil."
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Kabelli (Ethernet) Şebeke"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Telsiz-Vefa Şebeke(ler)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Telli qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Birlemci DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Telli bağlantı %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Köpür qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Köpür bağlantısı %d"
@@ -3271,34 +3661,40 @@ msgstr "Köpür bağlantısı %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Köpür Limanı"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Köpür limanı qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-dsl.c:219
+# tüklü
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Baba arayüz:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL bağlantısı %d"
 
 # tüklü
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3308,58 +3704,57 @@ msgstr ""
 "Bu seçenek burada girilen kalıcı MAC adreslerine göre belirlenen ağ "
 "aygıtlarına olan bağlantıyı kilitler. Örneğin: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "İhmal Etilgen"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Eternet qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Eternet"
 
 # tüklü
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Klonlanğan MAC adresi:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 #, fuzzy
 msgid "Wake-on-LAN password"
 msgstr "Sır-sözni köster"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Eternet bağlantısı %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Ögbelgileme"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Umumiy qullanıcı arayüzü yüklenamadı."
 
 # tüklü
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3370,184 +3765,188 @@ msgstr ""
 "Bu seçenek burada girilen kalıcı MAC adreslerine göre belirlenen ağ "
 "aygıtlarına olan bağlantıyı kilitler. Örneğin: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand bağlantısı %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "İPv4 qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Eternet bağlantısı %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Otomatik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Sadece otomatik (VPN) adresleri"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Avtomatik, faqat adresler"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Otomatik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Sadece otomatik (PPPoE) adresleri"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Otomatik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Sadece otomatik (DHCP) adresleri"
 
 # tüklü
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Faqat Yerli-İlişim"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Ek _DNS sunucıları:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Ek qıdırma _sahaları:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s için IPv4 yönlendiricisi düzenleniyor"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 Tesbitleri"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "İPv4 qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Avtomatik, ancaq DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s içün İPv6 marşrutlarını tahrir etüv"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "İPv6 Ayarları"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "İPv6 qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX qullanıcı arayüzü yüklenamadı."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX bağlantısı %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Mobil keniş-bant qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Desteklenmegen mobil keniş-bant bağlantı türü."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mobil Keniş-bant Teminatçı Türüni Saylañız"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3556,91 +3955,87 @@ msgstr ""
 "Mobil keniş-bant teminatçıñıznıñ qullanğanı tehnologiyanı saylañız.  Emin "
 "degil iseñiz, teminatçıñızğa sorañız."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Teminatçım _GSM-esaslı tehnologiya qullana (yani, GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Teminatçım _CDMA-esaslı tehnologiya qullana (yani, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "hiçbiri"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s için PPP doğrulama yöntemleri düzenleniyor"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP Tesbitleri"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Telli qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "VLAN qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Telli bağlantı %d"
@@ -3648,12 +4043,12 @@ msgstr "Telli bağlantı %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "Köpür Limanı"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Köpür limanı qullanıcı arayüzü yüklenamadı."
@@ -3661,58 +4056,58 @@ msgstr "Köpür limanı qullanıcı arayüzü yüklenamadı."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Şebeke bağlantısı yok"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "VLAN qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN qullanıcı arayüzü yüklenamadı."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' içün VPN plagin hızmeti tapılamadı."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' içün VPN plagin hızmeti tapılamadı."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Bağlantı muvaffaqiyetsizligi"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN qullanıcı arayüzü yüklenamadı."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' içün VPN plagin hızmeti tapılamadı."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Bir VPN Bağlantı Türü Saylañız"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3724,7 +4119,7 @@ msgstr ""
 "VPN plaginiñiz yoq."
 
 # tr
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3734,7 +4129,7 @@ msgstr ""
 "Telsiz-Vefa irişim noqtasına (AP) kilitler. Meselâ: 00:11:22:33:44:55"
 
 # tüklü
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3744,96 +4139,94 @@ msgstr ""
 "Bu seçenek burada girilen kalıcı MAC adreslerine göre belirlenen ağ "
 "aygıtlarına olan bağlantıyı kilitler. Örneğin: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi (Telsiz-Vefa) qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Her hangi cihaz"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Telsiz-Vefa bağlantı %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtarı (Onaltışarlama ya da ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Sır-ibaresi"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamik WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kurum"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi (Telsiz-Vefa) emniyeti qullanıcı arayüzü yüklenamadı; Wi-Fi ayarı "
 "eksik."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Telsiz-Vefa Emniyet"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi (Telsiz-Vefa) emniyeti qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "'%s' isminde bir dosya zaten mevcut."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "VPN bağlantısını %s ile yer değiştirme isteğiniz kaydedilsin mi?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN bağlantısı dışa aktarılamıyor"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3844,223 +4237,106 @@ msgstr ""
 "\n"
 "Hata: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN bağlantısı dışa aktarılıyor..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Kilit_sizle"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Bu cihaznı avtomatik olaraq kilitsizle"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Bağlantı Malümatı"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Faal Şebeke Bağlantıları"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Hususiy _anahtar:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Hususiy anahtar sır-sözü:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Qullanıcı şehadetnamesi:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Mobil keniş-bant bağlantıñız aşağıdaki ayarlar ile yapılandırılğandır:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Cihazıñız:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Teminatçıñız:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Planıñız:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Saylağanıñız ayarlarnı qullanaraq şimdi mobil keniş-bant teminatçıñızğa bir "
-"bağlantı yapılacaq.  Bağlantı muvafaqiyetsiz olsa yaki şebeke çoqraqlarını "
-"qullanalmasañız, ayarlarıñıznı çift-teşkeriñiz.  Mobil keniş-bant bağlantı "
-"ayarlarıñıznı deñiştirmek içün, Sistem >> Tercihler menüsinden \"Şebeke "
-"Bağlantıları\"nı saylañız."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Mobil Keniş-bant Ayarlarıñıznı Tasdiqlañız"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Ülkem listelenmegendir"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Listelenmegen"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Planıñıznı saylañız:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Saylanğan plan İrişim Noqtası _Adı (İNA; APN):"
-
-# tüklü
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Tenbih: Yañlış bir plannıñ saylanuvı keniş-bant hesabıñız içün faturalama "
-"meselelerine yol açabilir yaki bağlanabilirlikke yol bermeybilir.\n"
-"\n"
-"Planıñız haqqında emin degil iseñiz teminatçıñızdan planıñıznıñ İrişim "
-"Noqtası Adını (İNA, APN) sorañız."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Faturalama Planıñıznı Saylañız"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Planım listelenmegendir..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Teminatçıñıznı bir _cedvelden saylañız:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Teminatçı"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Teminatçı:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Teminatçım GSM tehnologiyasını qullana (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Teminatçım CDMA tehnologiyasını qullana (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Teminatçıñıznı Saylañız"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Ülke yaki Bölge Cedveli:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Memleket yaki bölge"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Ülkem listelenmegendir"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Teminatçıñıznıñ Memleket yaki Bölgesini Saylañız"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Kurulu GSM aygıtı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Kurulu CDMA aygıtı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Her hangi cihaz"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Yañı Mobil Keniş-bant Bağlantısı"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4068,190 +4344,270 @@ msgstr ""
 "Bu muavin sizge bir hüceyresel (3G) şebekege mobil keniş-bant bağlantısını "
 "qolayca ayarlamağa yardım eter."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Aşağıdaki malümatqa ihtiyacıñız olacaq:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Keniş-bant teminatçıñıznıñ adı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Keniş-bant faturalama planıñıznıñ adı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(bazan) Keniş-bant faturalama planıñıznıñ İrişim Noqtası Adı (İNA; APN)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "_Bu mobil keniş-bant cihazı içün bir bağlantı icat etiñiz:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Her hangi cihaz"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Bir Mobil Keniş-bant Bağlantısını Ayarlañız"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Yañı Mobil Keniş-bant Bağlantısı"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Memleket yaki bölge"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Teminatçıñıznıñ Memleket yaki Bölgesini Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Teminatçıñıznı bir _cedvelden saylañız:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Teminatçım GSM tehnologiyasını qullana (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Teminatçım CDMA tehnologiyasını qullana (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Teminatçıñıznı Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Planıñıznı saylañız:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Saylanğan plan İrişim Noqtası _Adı (İNA; APN):"
+
+# tüklü
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Tenbih: Yañlış bir plannıñ saylanuvı keniş-bant hesabıñız içün faturalama "
+"meselelerine yol açabilir yaki bağlanabilirlikke yol bermeybilir.\n"
+"\n"
+"Planıñız haqqında emin degil iseñiz teminatçıñızdan planıñıznıñ İrişim "
+"Noqtası Adını (İNA, APN) sorañız."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Faturalama Planıñıznı Saylañız"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Mobil keniş-bant bağlantıñız aşağıdaki ayarlar ile yapılandırılğandır:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Cihazıñız:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Teminatçıñız:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Planıñız:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Saylağanıñız ayarlarnı qullanaraq şimdi mobil keniş-bant teminatçıñızğa bir "
+"bağlantı yapılacaq.  Bağlantı muvafaqiyetsiz olsa yaki şebeke çoqraqlarını "
+"qullanalmasañız, ayarlarıñıznı çift-teşkeriñiz.  Mobil keniş-bant bağlantı "
+"ayarlarıñıznı deñiştirmek içün, Sistem >> Tercihler menüsinden \"Şebeke "
+"Bağlantıları\"nı saylañız."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobil Keniş-bant Ayarlarıñıznı Tasdiqlañız"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(hiçbiri)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA Şehadetnamesi:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Bilinmiyor"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Bir dosya seçin"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Bir dosya seçin"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "CA Sertifikası Seç"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Qullanıcı şehadetnamesi:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Bağlantını tahrir etkende hata"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "Kilit_sizle"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Bu sır-söz içün her sefer _sora"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s' ağına bağlanmak için parola gerekli."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Ekilemci Sır-söz:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Sır-sözlerni _köster"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Ekilemci Sır-söz:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Sır-sözlerni _köster"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Ekilemci Sır-söz:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Parola:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Bağlantını qopar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Yoq"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamik WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "İcat _Et"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4259,35 +4615,35 @@ msgstr ""
 "'%s' Telsiz-Vefa şebekesine irişim içün sır-sözler ya da şifreleme "
 "anahtarları şarttır."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Telsiz-Vefa Şebeke Sahihlenimi Şart"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Telsiz-Vefa şebeke sahihlenimni talap ete"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Yañı Telsiz-Vefa şebeke"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "İcat etmege istegeniñiz Telsiz-Vefa şebeke içün bir isim kirsetiñiz."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Gizli Telsiz-Vefa şebeke"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4295,36 +4651,56 @@ msgstr ""
 "Bağlanmağa istegeniñiz gizli Telsiz-Vefa şebekesiniñ ismini ve emniyet "
 "tafsilâtını kirsetiñiz."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Telsiz-Vefa _emniyeti:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Bağlantı:"
 
 # tüklü
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Telsiz-Vefa _uyarlayıcısı:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Teminatçı:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Ülke yaki Bölge Cedveli:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Memleket yaki bölge"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Telli"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4334,17 +4710,40 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Telsiz-Vefa _emniyeti:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Şebeke _adı:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Bağlantı:"
+
+# tüklü
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Telsiz-Vefa _uyarlayıcısı:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Qullanılış:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4353,7 +4752,7 @@ msgstr ""
 "Projects/NetworkManager/)."
 
 # tüklü
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4361,417 +4760,472 @@ msgstr ""
 "O, buyruq-satrı tesirleşimi içün tasarımlanmağandır, onıñ yerine GNOME "
 "masaüstü çevresinde çapar."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS (Umumiy Paket Radio Hızmeti; UPRH)"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS (Alemiy Mobil Telehaberleşme Sistemi; AMTS)"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA (Yüksek-Sur'at Aşağı-ilişim Paket İrişimi; YSAPİ)"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA (Yüksek-Sur'at Yuqarı-ilişim Paket İrişimi; YSYPİ)"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA (Yüksek-Sur'at Paket İrişimi; YSPİ)"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+ (Yüksek-Sür'at Paket İrişimi; YSPİ)"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "qabilleştirilmegen"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "qayd etilmegen"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ev şebekesi (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Ev şebekesi"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "qıdırıla"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "qayd inkâr etile"
 
 # tüklü
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s kezeleme)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (kezeleme)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Kezeleme şebekesi (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Kezeleme şebekesi"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%2$s' üzerindeki '%1$s' SIM kartınıñ PIN kodu"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN kodu gerekli"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobil kenişbant cihazı içün PİN kodu kerekli"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobil kenişbant bağlantısı '%s' faal: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "kezeleme"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s bağlantısı"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "DER, PEM, yaki PKCS#12 hususiy anahtarları (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Bir PAC dosyesini saylañız..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyeleri (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Dosyelerniñ hepsi"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "İsimsiz"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Sahihlengen"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ekisi de"
 
 # tüklü
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Anonim kimlik:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _dosyesi:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_İç sahihlenme:"
 
 # tüklü
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Avtomatik PAC _tedarikine izin ber"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Bir Sertifika Yetkilisi sertifikası seçin..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Sürüm 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Sürüm 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Şehadetname _Salâhiyeti (ŞS; CA) şehadetnamesi:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _sürümi:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Hususiy Anahtar Sır-sözü:"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Sır-sözlerni _köster"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Kimlik:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tünnelli TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Himayeli EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Sahihlenim:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Ögbelgilengen)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Açıq Sistem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Üleşilgen Anahtar"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Ögbelgilengen)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Anahtar:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Anahtarnı _köster"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP _indeksi:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tür:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (ögbelgilengen)"
+
+#~ msgid "Ignored"
+#~ msgstr "İhmal Etilgen"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Bilinmegen bir hatadan dolayı bağlantı sırları yañartılamadı."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Evveliyet:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Bağlantı _Malümatı"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN bağlantısı içe aktarılamıyor"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "'%s' dosyası okunamadı ya da tanınan VPN bağlantı bilgisini içermiyor.\n"
+#~ "\n"
+#~ "Hata: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Bilinmegen hata"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Faal Şebeke Bağlantıları"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Bir Sertifika Yetkilisi sertifikası seçin..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Şehadetname _Salâhiyeti (ŞS; CA) şehadetnamesi:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Şebeke İdarecisi"
@@ -4805,15 +5259,6 @@ msgstr "_Tür:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "_Avto-añlaş"
 
@@ -4911,12 +5356,6 @@ msgstr "_Tür:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Ekilemci DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Üçlemci DNS:"
-
 # tüklü
 #~ msgid "_Device MAC address:"
 #~ msgstr "_Cihaz MAC adresi:"
@@ -4969,12 +5408,6 @@ msgstr "_Tür:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Sadece otomatik (PPP) adresleri"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX qullanıcı arayüzü yüklenamadı."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX bağlantısı %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5001,9 +5434,6 @@ msgstr "_Tür:"
 #~ msgid "Error: %s"
 #~ msgstr "Hata: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN bağlantısı icat etilamadı: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefonıñız şimdi qullanımğa hazırdır!"
 
@@ -5199,12 +5629,6 @@ msgstr "_Tür:"
 #~ msgid "Error creating connection editor dialog."
 #~ msgstr "Bağlantı muharriri dialogı icat etilamadı."
 
-#~ msgid "_Import"
-#~ msgstr "_İthal Et"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Öz-özünden _bağlan"
-
 #~ msgid "Available to all users"
 #~ msgstr "Qullanıcılarnıñ hepsi tarafından faydalanılabilir"
 
@@ -5295,12 +5719,6 @@ msgstr "_Tür:"
 #~ "haydut telsiz ağlara neden olabilir. Bir Sertifika Yetkilisi "
 #~ "sertifikasını seçmek ister misiniz?"
 
-#~ msgid "No"
-#~ msgstr "Hayır"
-
-#~ msgid "Yes"
-#~ msgstr "Ebet"
-
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "Bir telsiz ağa bağlanmak için bu simgeye tıklayın"
 
@@ -5393,13 +5811,6 @@ msgstr "_Tür:"
 #~ msgid "PUK code is needed for the mobile broadband device"
 #~ msgstr "mobil genişbant aygıtı için PUK kodu gerekli"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Reşat SABIQ <tilde.birlik@gmail.com>\n"
-#~ "\n"
-#~ "Launchpad Contributions:\n"
-#~ "  Reşat SABIQ https://launchpad.net/~tilde-birlik"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
@@ -5632,9 +6043,6 @@ msgstr "_Tür:"
 #~ msgid "Inner Authentication:"
 #~ msgstr "İç Sahihlenüv:"
 
-#~ msgid "Private Key Password:"
-#~ msgstr "Hususiy Anahtar Sır-sözü:"
-
 #~ msgid "Private Key:"
 #~ msgstr "Hususiy Anahtar:"
 
diff --git a/po/cs.po b/po/cs.po
index 240a6765..e8ad47cc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-05-06 16:46+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-05-08 12:54+0200\n"
 "Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Generator: Poedit 2.2.1\n"
 "X-Project-Style: gnome\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198 src/applet-dialogs.c:737
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
 #: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Síť"
@@ -437,117 +437,117 @@ msgstr "zařízení není spravováno"
 msgid "No network devices available"
 msgstr "Nejsou dostupná žádná síťová zařízení"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Připojení k _VPN"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Nastavit VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Přid_at připojení k VPN…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager neběží…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Síť zakázána"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Povolit _síť"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Povolit _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Povolit _mobilní širokopásmová připojení"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Povolit up_ozornění"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informace o spojení"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Upravit připojení…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Jste právě připojeni k „%s“."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Odpojen"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Připojení k síti bylo odpojeno."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Připravuje se připojení k síti „%s“…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Je vyžadováno ověření uživatele pro připojení „%s“…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Žádá se o síťovou adresu pro „%s“…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Připojení k síti „%s“ je aktivní"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Spouští se připojení k VPN „%s“…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Je vyžadováno ověření uživatele pro připojení k VPN „%s“…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Žádá se o síťovou adresu k VPN pro „%s“…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Připojení k VPN je aktivní"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Žádné síťové připojení"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
@@ -1088,16 +1088,16 @@ msgstr "Nový kód PIN znovu:"
 msgid "Show PIN/PUK codes"
 msgstr "Ukázat kód PIN/PUK"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Připojení nemá žádná nastavení VPN"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Selhal zápis připojení do VPN UI: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Selhal zápis připojení do VPN UI: neúplný zápis"
 
@@ -3863,12 +3863,12 @@ msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Můj poskytovatel používá technologii založenou na C_DMA (tj. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4189,32 +4189,28 @@ msgstr "_Certifikát %s"
 msgid "My country is not listed"
 msgstr "Moje země není v seznamu"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Není v seznamu"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Můj plán není v seznamu…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Poskytovatel"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Země nebo region"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nainstalované zařízení GSM"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nainstalované zařízení CDMA"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Jakékoli zařízení"
 
@@ -4246,23 +4242,24 @@ msgstr "Název vašeho tarifu"
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(v některých případech) Přístupový bod (APN) pro váš tarif"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Vytvořit připojení pro _toto mobilní širokopásmové zařízení:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Nastavit mobilní širokopásmové připojení"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Seznam zemí: nebo regionů:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Země nebo region"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Zvolte zemi nebo region svého poskytovatele"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Vybrat poskytovate_le ze seznamu:"
 
@@ -4535,6 +4532,14 @@ msgstr "Ne_mohu najít svého poskytovatele, chci jej zadat ručně:"
 msgid "Provider:"
 msgstr "Poskytovatel:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Seznam zemí: nebo regionů:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Země nebo region"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Drátové"
diff --git a/po/da.po b/po/da.po
index 60d08adc..e84ee862 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
-"applet/issues\n"
-"POT-Creation-Date: 2019-02-27 18:32+0000\n"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-03-04 15:08+0200\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -30,7 +30,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Netværk"
 
@@ -111,7 +112,6 @@ msgstr ""
 "ny version."
 
 #: org.gnome.nm-applet.gschema.xml.in:31
-#| msgid "Disable Wi-Fi Create"
 msgid "Disable WiFi Create"
 msgstr "Deaktivér oprettelse af WiFi"
 
@@ -225,7 +225,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "802.1X-godkendelse"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -464,117 +464,117 @@ msgstr "enhed er ikke redigeret"
 msgid "No network devices available"
 msgstr "Ingen tilgængelige netværksenheder"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-forbindelser"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Konfigurér VPN …"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Tilføj en VPN-forbindelse …"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Netværkshåndtering kører ikke …"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Netværk deaktiveret"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Aktivér _netværk"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Aktivér _wi-fi-netværk"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivér _mobilt bredbånd"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Aktivér _påmindelser"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Forbindelses_information"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Håndtér forbindelser …"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Om"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Du er nu tilsluttet “%s”."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Afbrudt"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Netværksforbindelsen er blevet afbrudt."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Forbereder netværksforbindelsen “%s” …"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Der kræves brugergodkendelse til netværksforbindelsen “%s” …"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Anmoder om en netværksadresse for “%s” …"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Netværksforbindelsen “%s” er aktiv"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Starter VPN-forbindelsen “%s” …"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Der kræves brugergodkendelse til VPN-forbindelsen “%s” …"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Anmoder om en VPN-adresse for “%s” …"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-forbindelsen er aktiv"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ingen netværksforbindelse"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Panelprogram til Netværkshåndtering"
 
@@ -591,7 +591,7 @@ msgstr "Forkert PIN-kode; kontakt venligst din udbyder."
 msgid "Sending unlock code…"
 msgstr "Sender oplåsningskode …"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
@@ -713,7 +713,7 @@ msgstr "Ethernet-netværksforbindelsen “%s” er aktiv"
 msgid "DSL authentication"
 msgstr "DSL-godkendelse"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -821,183 +821,188 @@ msgstr "Wi-fi-netværksforbindelsen “%s” er aktiv"
 msgid "Failed to activate connection"
 msgstr "Kunne ikke aktivere forbindelse"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Fejl ved visning af forbindelsesinformation:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Flere adresser"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Rundsendingsadresse"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Undernetmaske"
 
-#: src/applet-dialogs.c:439
-#| msgid "_Primary"
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "Primær DNS"
 
-#: src/applet-dialogs.c:439
-#| msgid "Secondary DNS:"
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "Sekundær DNS"
 
-#: src/applet-dialogs.c:439
-#| msgid "Ternary DNS:"
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "Tertiær DNS"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Generelt"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Grænseflade"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardwareadresse"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Hastighed"
 
-#: src/applet-dialogs.c:584
-#| msgid "Security:"
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Sikkerhed"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Standardrute"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Adgangskode:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-type"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-gateway"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-brugernavn"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-banner"
 
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Basisforbindelse"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive forbindelser fundet!"
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1007,18 +1012,18 @@ msgstr ""
 "Ophavsret © 2005-2008 Novell, Inc.\n"
 "og mange andre bidragydere fra fællesskabet samt oversættere"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Statusfelt-panelprogram til håndtering af dine netværksenheder og -"
 "forbindelser."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Websted for Netværkshåndtering"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "David Nielsen <dnielsen@breakmygentoo.net>, 2004.\n"
@@ -1032,7 +1037,7 @@ msgstr ""
 "Ask Hjorth Larsen <asklarsen@gmail.com>, 2012-2014.\n"
 "Alan Mortensen <alanmortensen.am@gmail.com>, 2017."
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1040,33 +1045,33 @@ msgstr ""
 "Panelprogrammet til Netværkshåndtering kunne ikke finde nogle krævede "
 "ressourcer (.ui-filen blev ikke fundet)."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Manglende ressourcer"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Adgangskode til mobilt bredbåndsnetværk"
 
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Der kræves en adgangskode for at forbinde til “%s”."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-oplåsning kræves"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-oplåsning kræves"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1075,25 +1080,25 @@ msgstr ""
 "Den mobile bredbåndsenhed “%s” kræver en SIM PIN-kode, før den kan bruges."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-oplåsning kræves"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK-oplåsning kræves"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1102,35 +1107,35 @@ msgstr ""
 "Den mobile bredbåndsenhed “%s” kræver en SIM PUK-kode, før den kan bruges."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Gentag ny PIN-kode:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN-/PUK-koder"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Forbindelsen havde ikke nogen VPN-indstilling"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Kunne ikke skrive forbindelse til VPN-UI: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Kunne ikke skrive forbindelse til VPN-UI: ufuldstændig skrivning"
 
@@ -3044,10 +3049,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Klient"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Hotspot"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
@@ -3902,12 +3903,12 @@ msgstr "Min udbyder bruger _GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min udbyder bruger C_DMA-teknologi (f.eks. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4183,6 +4184,10 @@ msgstr "Forbindelsesinformation"
 msgid "_Close"
 msgstr "_Luk"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4226,32 +4231,28 @@ msgstr "%s-_certifikat"
 msgid "My country is not listed"
 msgstr "Mit land er ikke på listen"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikke på listen"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mit abonnement er ikke på listen …"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Udbyder"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land eller region"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installeret GSM-enhed"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installeret CDMA-enhed"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Enhver enhed"
 
@@ -4285,23 +4286,24 @@ msgstr ""
 "(i visse tilfælde) APN (Access Point Name) for afregning af dit "
 "bredbåndsabonnement"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Opret en forbindelse til _denne mobile bredbåndsenhed:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Opsæt en mobil bredbåndsforbindelse"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Land- eller regionsliste:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Vælg din udbyders land eller region"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Vælg din udbyder på en _liste:"
 
@@ -4581,6 +4583,14 @@ msgstr ""
 msgid "Provider:"
 msgstr "Udbyder:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Land- eller regionsliste:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land eller region"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kablet"
diff --git a/po/de.po b/po/de.po
index 3e5c9134..f8c1b8a5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,8 +22,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-08-25 23:06+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
@@ -34,49 +35,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Verwaltung der Netzwerkverbindungen"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "Rohkonfiguration"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Einstellungen für Verbindungen mit Netzwerken verwalten"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Benachrichtigungen über neue Verbindung abschalten"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Legt fest, ob Benachrichtigungen über Verbindungen mit einem Netzwerk "
 "abgeschaltet werden."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Benachrichtigungen über Verbindungstrennung abschalten"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem "
 "Netzwerk abgeschaltet werden."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN-Benachrichtigungen abschalten"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -84,53 +94,54 @@ msgstr ""
 "Legt fest, ob Benachrichtigungen über die Verbindungstrennung von einem VPN-"
 "Netzwerk abgeschaltet werden."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Benachrichtigung über neue Funknetzwerke unterdrücken"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Legt fest, ob Benachrichtigungen über neue Funknetzwerke abgeschaltet werden."
 
 # ?
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Einstellungen übernehmen"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Legt fest, ob die Einstellungen in eine neue Version übernommen werden "
 "sollen."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Das Erstellen von Wi-Fi-Netzen ausschalten"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Legt fest, ob die Erstellung von Adhoc-Netzwerken mit dem Applet "
 "abgeschaltet ist."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Applet im Benachrichtigungsbereich anzeigen"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Wählen Sie FALSCH, um die Anzeige des Applets im Benachrichtigungsbereich zu "
 "deaktivieren."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA-Zertifikat ignorieren"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -138,7 +149,7 @@ msgstr ""
 "Legt fest, ob Warnungen zu CA-Zertifikaten in der EAP-Authentifizierung "
 "abgeschaltet werden."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -146,15 +157,15 @@ msgstr ""
 "Legt fest, ob Warnungen zu CA-Zertifikaten in Phase 2 der EAP-"
 "Authentifizierung abgeschaltet werden."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Netzwerkverwaltung-Verbindungseditor"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -162,7 +173,7 @@ msgstr ""
 "NetworkManager ist ein Systemdienst zur Verwaltung und Einrichtung Ihrer "
 "Netzwerkverbindungen und -geräte."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -170,21 +181,21 @@ msgstr ""
 "nm-connection-editor arbeitet gemeinsam mit NetworkManager zum Anlegen und "
 "Bearbeiten von vorhandenen Verbindungsprofilen für NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Die NetworkManager-Entwickler"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "Objektklasse »%s« hat keine Eigenschaft namens »%s«"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "Eigenschaft »%s« von Objektklasse »%s« ist nicht schreibbar"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -192,20 +203,20 @@ msgstr ""
 "Konstruktor-Eigenschaft »%s« für Objekt »%s« kann nicht nach der "
 "Konstruktion gesetzt werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "»%s::%s« ist ein ungültiger Eigenschaftsname. »%s« ist kein GObject-Untertyp"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "Eigenschaft »%s« des Typs »%s« von Wert des Typs »%s« kann nicht gesetzt "
 "werden"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -214,81 +225,80 @@ msgstr ""
 "Wert »%s« des Typs »%s« ist ungültig oder nicht im Wertebereich für "
 "Eigenschaft »%s« des Typs »%s«"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-Legitimierung"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Netzwerkname"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sicher."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Hinzufügen/Aktivierung der Verbindung schlug fehl"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Trennen des Gerätes schlug fehl"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Trennen schlug fehl"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivierung der Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Diesen Hinweis nicht mehr anzeigen"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -299,7 +309,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« wurde getrennt, weil die Netzwerkverbindung getrennt "
 "wurde."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +320,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung getrennt wurde."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -320,7 +330,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "unerwartet beendet wurde."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -331,7 +341,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Server "
 "keine geeignete Netzwerkkonfiguration lieferte."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -341,7 +351,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung eine Zeitüberschreitung verursacht hat."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +361,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "nicht in der vorgesehenen Zeit gestartet wurde."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -361,7 +371,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der Start des "
 "VPN-Dienstes fehlgeschlagen ist."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +381,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil keine gültigen "
 "VPN-Geheimnisse vorliegen."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -381,7 +391,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil VPN-"
 "Geheimnisse ungültig sind."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -390,7 +400,7 @@ msgstr ""
 "\n"
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -401,19 +411,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Die VPN-Verbindung wurde erfolgreich eingerichtet.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN-Anmeldemitteilung"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -427,7 +437,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -440,564 +450,575 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "Gerät ist nicht betriebsbereit (Firmware fehlt)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "Gerät ist nicht betriebsbereit"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "Gerät wird nicht verwaltet"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Es sind keine Netzwerkgeräte verfügbar"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPN _konfigurieren …"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Eine VPN-Verbindung _hinzufügen …"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Netzwerk aktivieren"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Funknetzwerk aktivieren"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiles Breitband aktivieren"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Benachrichtigungen aktivieren"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Verbindungen bearbeiten …"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Sie sind nun mit »%s« verbunden."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Netzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s« …"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Netzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Netzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN-Verbindung »%s« wird gestartet …"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Benutzerlegitimierung ist erforderlich für VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Anfordern einer Netzwerkadresse von VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-Verbindung ist aktiv"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Falscher PUK-Code. Bitte kontaktieren Sie Ihren Dienstanbieter."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Falscher PIN-Code. Bitte kontaktieren Sie Ihren Dienstanbieter."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Code zum Entsperren wird gesendet …"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiles Breitband (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobiles Breitband"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Verfügbar"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Neue mobile Breitbandverbindung …"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Verbindung hergestellt"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sie sind nun mit dem mobilen Breitbandnetzwerk verbunden."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobiles Breitbandnetzwerk."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Sie sind nun im Heimnetzwerk angemeldet."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Sie sind nun in einem Roaming-Netzwerk angemeldet."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Sie sind nun mit dem mobilen Breitbandnetzwerk verbunden."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Mobile Breitbandverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mobile Breitbandverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Benutzerlegitimierung ist erforderlich für mobile Breitbandverbindung »%s« …"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto-Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet-Netze (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet-Netz (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet-Netze"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet-Netz"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Sie sind nun mit dem Ethernet-Netzwerk verbunden."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ethernet-Netzverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Ethernet-Netzverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Benutzerlegitimierung ist erforderlich für Ethernet-Netzverbindung »%s« …"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Netzwerkadresse für Ethernet-Netz »%s« wird angefordert …"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet-Netzverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-Legitimierung"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Mit einem _verborgenen Funknetzwerk verbinden …"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Neues _Funknetzwerk erstellen …"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Hinzufügen einer neuen Verbindung schlug fehl"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Unzureichende Berechtigungen."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Funknetzwerke (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Funknetzwerk (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Funknetzwerk"
 msgstr[1] "Funknetzwerke"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Funknetzwerk ist deaktiviert"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Funknetzwerk wurde durch Schalter deaktiviert"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Weitere Netzwerke"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Funknetzwerke sind verfügbar"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 "Verwenden Sie das Netzwerkmenü, um sich mit einem Funknetzwerk zu verbinden"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Sie sind nun mit dem Funknetzwerk »%s« verbunden."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Funknetzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Funknetzwerkverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Benutzerlegitimierung ist erforderlich für Funknetzwerk »%s« …"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Funknetzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Funknetzwerkverbindung mit »%s« ist aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Funknetzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Aktivierung der Verbindung schlug fehl"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisches WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Weitere Adressen"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (Vorgabe)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast-Adresse"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnetz-Maske"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primär"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Sekundäres Passwort:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardware-Adresse"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Treiber"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sicherheit:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Vorgaberoute"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignoriert"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Passwort:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-Typ"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-Gateway"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-Benutzername"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-Banner"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Zugordnete Verbindung"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Keine aktiven Netzwerkverbindungen gefunden!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1007,24 +1028,24 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "und viele andere Mitwirkende und Übersetzer"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Ein Applet für das Benachrichtigungsfeld, mit dem Sie Ihre Netzwerkgeräte "
 "und Netzwerkverbindungen verwalten können."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Netzwerk-Manager-Website"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016, 2017\n"
 "Christian Kirbach <christian.kirbach@gmail.com>, 2014, 2016, 2017"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1032,33 +1053,33 @@ msgstr ""
 "Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden (Die ."
 "ui-Datei wurde nicht gefunden)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Fehlende Ressourcen"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Passwort der mobilen Breitbandverbindung"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Entsperren der SIM-Karte mittels PIN-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Entsperren der SIM-Karte mittels PIN-Code erforderlich"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1067,25 +1088,25 @@ msgstr ""
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung eine SIM-PIN-Nummer."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-Code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN-Code anzeigen"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Entsperren der SIM-Karte mittels PUK-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Entsperren der SIM-Karte mittels PUK-Code erforderlich"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1094,43 +1115,43 @@ msgstr ""
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung einen SIM-PUK-Code."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-Code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Neuer PIN-Code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Geben Sie den neuen PIN-Code erneut ein:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK-Codes anzeigen"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Die Verbindung hat keine VPN-Einstellungen"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr ""
 "Verbindungsmeldung an die VPN Benutzeroberfläche fehlgeschlagen: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Fehler beim Schreiben von Verbindung zum VPN UI: unvollständiges Schreiben"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1138,41 +1159,41 @@ msgstr ""
 "IP-Adressen identifizieren Ihren Rechner im Netzwerk. Klicken Sie auf den "
 "Knopf »Hinzufügen«, um eine IP-Adresse hinzuzufügen."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Automatisch bezogene Routen ig_norieren"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Diese Verbindung nur für Ress_ourcen dieses Netzwerks verwenden"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1180,15 +1201,15 @@ msgstr ""
 "Falls aktiviert, wird diese Verbindung niemals als Standard-"
 "Netzwerkverbindung verwendet."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "E_rstellen …"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Verbindungstyp wählen"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1200,84 +1221,93 @@ msgstr ""
 "Liste erscheint, haben Sie möglicherweise nicht das richtige VPN-Plugin "
 "installiert."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Gerät"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Rundlaufverfahren"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktive Sicherungskopie"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptive Lastverteilung der Übertragung"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptive Lastverteilung"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (empfohlen)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "Ge_bündelte Verbindungen"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "M_odus"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Überwachungs_häufigkeit"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Name der _Schnittstelle"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "_Verbindungsüberwachung"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "ARP-_Ziele"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1285,19 +1315,19 @@ msgstr ""
 "Eine IP-Adresse oder eine durch Kommata getrennte Liste von IP-Adressen, "
 "nach denen gesucht wird, wenn der Verbindungsstatus geprüft wird."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Verzögerung bei _Aktivierung einer Verbindung"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Verzögerung bei _Deaktivierung einer Verbindung"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Primär"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1305,43 +1335,43 @@ msgstr ""
 "Der Schnittstellenname des Primärgerätes. Falls gesetzt, wird dieses Gerät "
 "bei Verfügbarkeit immer der aktive Sklave sein."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "Bytes"
 
 # Thema: Routing-Protokoll
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "Pfad_kosten"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Priorität"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "_Hairpin-Modus"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "_Verbindungen über Brücke"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "_Zustellungsverzögerung"
 
@@ -1349,28 +1379,31 @@ msgstr "_Zustellungsverzögerung"
 # * Senden von Keepalives in bestimmten Intervallen (damit wird bestätigt, ob die Kommunikation noch besteht)
 # * Zur Entdeckung eines Nachbarn
 # * Aushandlung Parameter ...
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "_Hello-Zeitintervall"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP-Weiterleitungsverzögerung in Sekunden"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP-Hello-Zeit in Sekunden"
 
 # http://netzikon.net/lexikon/i/igmp-snooping.html
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "I_GMP-Schnüffeln aktivieren"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1380,18 +1413,18 @@ msgstr ""
 "dass das System diese Funktion automatisch verweigern kann, solange eine "
 "Hash-Kollision erkannt wird."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP aktivieren (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "Legt fest, ob das Spanning Tree Protocol (STP) für diese Bridge aktiviert "
 "sein soll"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1399,27 +1432,27 @@ msgstr ""
 "STP-Priorität für diese Brücke. Niedrigere Werte sind »besser«. Die Brücke "
 "mit der niedrigsten Priorität wird zur »root-Brücke« gewählt."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Höchstzulässiges Alter"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Höchstzulässiges Alter von STP-Nachrichten in Sekunden"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "_Alterungszeit"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Die Lebensdauer der Ethernet MAC-Adresse in Sekunden"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1431,40 +1464,40 @@ msgstr ""
 "In der Maske dürfen nicht die Bits 0, 1 oder 2 gesetzt werden, weil sie für "
 "STP, MAC Pause-Frames und LACP verwendet werden."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "Automatisch"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "Vorgabe"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "Unbestimmter Fehler"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Beibehalten"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Dauerhaft"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabil"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1475,182 +1508,225 @@ msgstr ""
 "Funktionsmerkmal ist als »MAC-Cloning« oder »MAC-Spoofing« bekannt. "
 "Beispiel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Hardware-Adresse"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s ungültig für %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s ungültig (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "ungültiger Schnittstellenname für %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "ungültiger Schnittstellenname (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "Gerätename kann nicht ausgelesen werden"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "ungültige Hardware-Adresse"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "%s ungültig (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "Gerät"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "%s ungültig (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Data Center Bridging (DCB) für diese Verbindung _verwenden"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Flusskontrolle"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funktion"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Bekannt geben"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Bereit"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Optionen …"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioritätsgruppen"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Priorität-Flusskontrolle"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Übertragung der Priorität-Pause für jede Benutzer-Priorität aktivieren oder "
 "deaktivieren."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Verkehrsklasse"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Strikte Bandbreite"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Priorität-Bandbreite"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Gruppenbandbreite"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Gruppenkennung"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Geben Sie die Priorität-Gruppenkennung für jede Benutzer-Priorität ein."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1658,35 +1734,35 @@ msgstr ""
 "Geben Sie die erlaubte Verbindungsbandbreite in Prozent ein, die jede "
 "Prioritäten-Gruppe verwenden darf. Die Summe aller Gruppen muss 100% ergeben."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Geben Sie den Prozentsatz jeder Priorität-Gruppenbandbreite ein, die jede "
 "Benutzer-Priorität verwenden darf."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Strikte Bandbreite für jede Benutzer-Priorität ein- oder ausschalten."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Geben Sie die Verkehrsklasse für jede Benutzer-Priorität ein."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "_Benutzername"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Zur Legitimierung am PPPoE-Dienst verwendeter Benutzername."
 
 # gemeint ist ein "VPN access concentrator".
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1694,55 +1770,53 @@ msgstr ""
 "Nur Sitzungen mit Gegenstellen starten, die den angegebenen Dienst bieten. "
 "Für die meisten Dienstanbieter sollte dieses Feld leer bleiben."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Dienst"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Passwort _anzeigen"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Zur Legitimierung am PPPoE-Dienst verwendetes Passwort."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Passwort"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "PPP-Schn_ittstelle"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "Ü_bergeordnete Schnittstelle"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 "Ein willkürlich gewählter Name, der der neu erstellten PPP-Schnittstelle "
 "zugeordnet wird."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Die Schnittstelle, über die die PPP-Verbindung aufgebaut wird."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "Schnittstelle _beanspruchen"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1755,138 +1829,131 @@ msgstr ""
 "nm-applet kann die Verbindung nur dann aktivieren, wenn diese Option "
 "ausgewählt ist."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mbit/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mbit/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gbit/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gbit/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Halb"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Voll"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Gerät"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "Duplizierte MA_C-Adresse"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Aufwecken über LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorieren"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "Passwort für Auf_wecken über LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Passwort für Aufwecken über LAN (eine Ethernet-MAC). Es ist nur für Magic-"
 "Pakete gültig."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "_Verbindungsaushandlung"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1896,11 +1963,11 @@ msgstr ""
 "und »Duplex«-Werte erzwungen, ohne die Gerätekompatibilität zu prüfen. Im "
 "Zweifelsfall die Einstellung auf »Ignore« belassen oder »Automatic« wählen."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Geschwindigkeit"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1911,11 +1978,11 @@ msgstr ""
 "Setzen eines Geschwindigkeitswerts sollte geprüft werden, dass das Gerät "
 "diese Einstellung unterstützt."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1926,32 +1993,32 @@ msgstr ""
 "eines Duplex-Modus sollte geprüft werden, dass das Gerät diese Einstellung "
 "unterstützt."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Nein"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Alle Ben_utzer dürfen dieses Netzwerk verwenden"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Automatisch mit _VPN verbinden"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "Firewall-_Zone"
 
 # Gemeint ist eine Verbindung, deren Nutzung gemessen und entsprechend abgerechnet wird.
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "_Kostenpflichtige Verbindung"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1964,11 +2031,11 @@ msgstr ""
 "oder »automatic« (automatisch), um den anhand von Verbindungstyp und anderen "
 "Heuristiken vorgegebenen Wert zu verwenden."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Automatisch mit Priorität _verbinden"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1978,7 +2045,7 @@ msgstr ""
 "größeren Zahlen werden bei der Auswahl der Profile für die automatische "
 "Aktivierung bevorzugt. Der Vorgabewert ist 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1987,7 +2054,7 @@ msgstr ""
 "Knopf »Hinzufügen«, um eine statische IP-Adresse hinzuzufügen, die "
 "zusätzlich zu den automatisch vergebenen Adressen eingerichtet wird."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1999,126 +2066,125 @@ msgstr ""
 "den Knopf »Hinzufügen«, um eine IP-Adresse hinzuzufügen. Wenn keine IP-"
 "Adresse angegeben ist, wird der Bereich automatisch ermittelt."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Zusätzliche statische Adressen"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adressen"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adresse (optional)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagramm"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "Über_tragungsmodus"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Gerätename"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Übergeordnetes Gerät"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Modus"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Lokale IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Entfernte IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Eingabeschlüssel"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Ausgabeschlüssel"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatisch mit manuellen DNS-Einstellungen"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Gemeinsam mit anderen Rechnern"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Methode"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2128,8 +2194,8 @@ msgstr ""
 "Konfiguration Ihres Rechners anzupassen. Geben Sie hier einen Bezeichner "
 "ein, wenn Sie ihn verwenden möchten."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2137,25 +2203,23 @@ msgstr ""
 "Beim Auflösen von Rechnernamen verwendete Domänen. Mehrere Domänen werden "
 "durch Kommata getrennt."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "D_HCP Client-Kennung"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "_Suchdomänen"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "_DNS-Server"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2163,11 +2227,11 @@ msgstr ""
 "IP-Adressen von Domänennamen-Servern, die zum Auflösen von Rechnernamen "
 "verwendet werden. Verwenden Sie Kommata zum Trennen mehrerer Server-Adressen."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4-Adressierung zur Fertigstellung dieser Verbindung erforderlich"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2176,34 +2240,34 @@ msgstr ""
 "einer Verbindung, falls die IPv4-Konfiguration fehlschlägt, die IPv6-"
 "Konfiguration dagegen erfolgreich ist."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Routen …"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Aktivieren (öffentliche Adresse bevorzugen)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Aktivieren (temporäre Adresse bevorzugen)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Stabile Privatsphäre"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2214,19 +2278,19 @@ msgstr ""
 "Adressen. Link-lokal-Adressen werden automatisch zur entsprechenden "
 "Schnittstelle weitergeleitet."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6-Erweiterungen zum Schutz der _Privatsphäre"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "IPv6-Adress_erstellungsmodus"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6-Adressierung zur Fertigstellung dieser Verbindung erforderlich"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2235,30 +2299,30 @@ msgstr ""
 "einer Verbindung, falls die IPv6-Konfiguration fehlschlägt, die IPv4-"
 "Konfiguration dagegen erfolgreich ist."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
 # prüfen oder Ankreuzen? -ck
 # Ich denke Überprüfen. -mb
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Überprüfen"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Streng"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Der Name des MACsec-Geräts."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2267,7 +2331,7 @@ msgstr ""
 "Verbindungskennung, anhand der diese MACSEC-Schnittstelle angelegt werden "
 "soll."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2276,15 +2340,15 @@ msgstr ""
 "Verbindungskennung, anhand der diese MACsec-Schnittstelle angelegt werden "
 "soll."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Der vorinstallierte Schlüsselname der Connectivity-Zuordnung"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Der zuvor freigegebene Connectivity Association Key"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2294,201 +2358,201 @@ msgstr ""
 "Agreement) bezogen wird. Für den EAP-Modus geben Sie die Parameter in der "
 "802.1X-Sicherheitsseite ein"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Schlüssel"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parameter"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Überprüfung"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI-Port"
 
 # Gemeint sind Ethernet-Rahmen
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Legt den Prüfmodus für eingehende Rahmen fest"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Legt fest, ob der übertragene Datenverkehr verschlüsselt sein muss"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Die Port-Komponente des SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Nu_mmer"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN (Zugangspunkt)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "N_etzwerkkennung"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Ändern …"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "PI_N"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "_Roaming erlauben, falls das Heimnetzwerk nicht verfügbar ist"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Pass_wörter anzeigen"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Legitimierung"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Zulässige Methoden"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "_Methoden konfigurieren …"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Komprimierung"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "P_unkt-zu-Punkt-Verschlüsselung (MPPE) verwenden"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-Bit-Verschlüsselung anfo_rdern"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_Stateful MPPE verwenden"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD-Datenkomprimierung erlauben"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate-Datenkomprimierung erlauben"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP-_Header-Komprimierung verwenden"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP-_Echopakete senden"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Keine"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Nur Browser"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Verwenden Sie diese Proxy-Einstellung nur für Browser."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC-Adresse"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "PAC-Skript"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "Adresse, von der das PAC-Skript bezogen wird."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Skript aus Datei importieren …"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Methode"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Er_weitert …"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Durch Master festgelegt"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Status des Ethernet-Ports"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Erweiterte Einstellungen für Team"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "_Warteschlangenkennung"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2496,21 +2560,21 @@ msgstr ""
 "Anzahl der Bursts mit »unsolicited NAs« und »gratuitous ARP«-Paketen, die "
 "nach dem Ein-/Ausschalten eines Ports gesendet werden."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 "Kennung der Warteschlange, auf welche dieser Port abgebildet werden soll."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Optionen für Active-Backup-Runner"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "Port-_Priorität"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2518,33 +2582,33 @@ msgstr ""
 "Der Wert ist eine positive Zahl in Millisekunden, die einen Intervall "
 "zwischen Bursts von Notify-Peer-Paketen angibt."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 "Port-Priorität, wobei eine größere Zahl für eine höhere Priorität steht."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "_Klebriger Port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Optionen für LACP-Runner"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "_LACP-Port-Priorität"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "LACP-Port-_Schlüssel"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2552,7 +2616,7 @@ msgstr ""
 "Anzahl der Bursts mit »Multicast Group Rejoin«-Anfragen, die nach dem Ein-/"
 "Ausschalten eines Ports gesendet werden."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2560,8 +2624,8 @@ msgstr ""
 "Port-Priorität entsprechend dem LACP-Standard, wobei eine kleinere Zahl eine "
 "höhere Priorität bedeutet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2569,7 +2633,7 @@ msgstr ""
 "Wert ist eine positive Zahl in Millisekunden. Legt ein Intervall fest "
 "zwischen Bursts von Multicast group-rejoin-Anfragen."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2577,48 +2641,48 @@ msgstr ""
 "Portschlüssel nach dem LACP-Standard. Es ist nur möglich Ports mit dem "
 "gleichen Schlüssel zu aggregieren."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "_Verbindungsüberwachung"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Verzögerung bei _Aktivierung"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Verzögerung bei _Deaktivierung"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "Sende_intervall"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Verzögerung _vor erstmaligem Senden"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Maximal nicht erhaltene Antworten"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Quellrechner"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "_Zielrechner"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2626,8 +2690,8 @@ msgstr ""
 "Höchstzahl an vermissten Antworten. Wenn diese Zahl überschritten wird, so "
 "wird die Verbindung als inaktiv gemeldet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2635,8 +2699,8 @@ msgstr ""
 "Rechnername, der in eine IP-Adresse umgewandelt werden soll. Sie wird als "
 "Quelladresse in ARP-Anfragen eingesetzt."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2644,13 +2708,13 @@ msgstr ""
 "Rechnername, der in eine IP-Adresse umgewandelt werden soll. Sie wird als "
 "Zieladresse in Anfragen eingesetzt."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ungültige Pakete _aktiver Ports ignorieren"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2658,13 +2722,13 @@ msgstr ""
 "Auf aktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, werden "
 "alle eingehenden ARP-Pakete als valide Antwort eingestuft."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ungültige Pakete i_naktiver Ports ignorieren"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2672,13 +2736,13 @@ msgstr ""
 "Auf inaktiven Ports erhaltene ARP-Pakete prüfen. Falls nicht angewählt, "
 "werden alle eingehenden ARP-Pakete als valide Antwort eingestuft."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "Auf inaktiven Ports _senden"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2686,163 +2750,162 @@ msgstr ""
 "Normalerweise werden ARP-Anfragen nur auf aktiven Ports gesendet. Mit dieser "
 "Option werden sie auch auf inaktiven Ports gesendet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
 "Die Verzögerung zwischen der Aktivierung des Links und der Benachrichtigung "
 "des Runners."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
 "Die Verzögerung zwischen der Deaktivierung des Links und der "
 "Benachrichtigung des Runners."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Das Intervall zwischen den zu sendenden Anfragen."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Die Verzögerung zwischen der Initialisierung der Linküberwachung und der "
 "ersten gesendeten Anfrage."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Die zu verwendende Verbindungsüberwachung."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Verbindungsüberwachung"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Team-Konfiguration aus Datei _importieren …"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "_JSON-Konfiguration bearbeiten"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Rohkonfiguration"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Höchste Priorität"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Höchste Priorität (stabil)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Bandbreite"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Höchste Anzahl der Ports"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Port-Priorität"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Vom Team-Gerät"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Vom aktiven Port"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Vom aktiven zum Team-Gerät"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Netzwerk-_Team"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Lastverteilung"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Jedes L3-Protokoll"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Jedes L4-Protokoll"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Benachrichtigungs_anzahl der Gegenstelle"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Benachrichtigungs_intervall der Gegenstelle"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "Rejoin-Anzahl für _Multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "_Rejoin-Intervall für Multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Hardware-Adresse"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2850,19 +2913,19 @@ msgstr ""
 "Die gewünschte Hardware-Adresse des neuen Team-Geräts. Akzeptiert wird das "
 "übliche Format für MAC-Adressen."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "_Runner"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Richtlinie der _Hardware-Adresse"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Name des zu verwendenden Runners."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2870,11 +2933,11 @@ msgstr ""
 "Dies definiert, wie Hardware-Adressen des Team-Geräts und Port-Geräte "
 "während der Lebensdauer des Teams eingerichtet werden sollen."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "LACPDU-Frames _periodisch senden"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2883,11 +2946,11 @@ msgstr ""
 "gesendet werden. Wenn nicht, wird »nur auf eingehende Nachrichten "
 "geantwortet«."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "LACPDU-Frames j_ede Sekunde senden"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2897,23 +2960,23 @@ msgstr ""
 "Pakete zu senden. Falls aktiviert, wird ein Paket pro Sekunde gesendet, "
 "ansonsten eines alle 30 Sekunden."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Systempriorität"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "_Minimale Ports"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Richtlinie für die _Aggregator-Auswahl"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Systempriorität, Wert kann 0 – 65535 sein."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2922,11 +2985,11 @@ msgstr ""
 "Carrier in der Hauptschnittstelle aktiviert wird. Der Wert kann zwischen 1 "
 "und 255 liegen."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Wählt die Richtlinie, anhand welcher die Aggregatoren gewählt werden."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2934,185 +2997,181 @@ msgstr ""
 "Liste der Fragmenttypen (Zeichenketten), die für die Berechnung der Tx-"
 "Prüfsumme der Pakete verwendet werden soll."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Felder für die Übertragungsprüfsumme"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "In Zehntel einer Sekunde. Periodisches Intervall zwischen Neubalancierung."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Name der aktiven Tx-Balancierung. Aktive Tx-Balancierung ist per Vorgabe "
 "ausgeschaltet."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "_Intervall der Übertragungsbalancierung"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "_Übertragungsbalancierung"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Runner"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "Ü_bergeordnete Schnittstelle"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "Name der VLAN-_Schnittstelle"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "_Duplizierte MAC-Adresse"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN-_Kennung"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Flags"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "Header neu _anordnen"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Lockere Bindung"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Gerätename und -nummer"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "»vlan« + Nummer"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Client"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "_Sendeleistung"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Rate"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Kanal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Ban_d"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Für diese Aktion besteht keine polkit-Zulassung"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Zulässige Legitimierungsmethoden"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Erweiterbares Legitimierungsprotokoll"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Passwort-Legitimierungsprotokoll"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "»Challenge Handshake Authentication Protocol«"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "»Microsoft Challenge Handshake Authentication Protocol«"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3121,98 +3180,94 @@ msgstr ""
 "Legitimierungsmethoden. Falls eine Verbindung fehlschlägt, versuchen Sie, "
 "die Unterstützung für einige Methoden zu deaktivieren."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Funknetzwerk"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Gebündelt"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Brücke"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP-Tunnel"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Kein VPN-Service-Typ."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "Das VPN-Plugin konnte die VPN-Verbindung nicht richtig importieren: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Datei zum Import auswählen"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Öffnen"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Gespeicherte VPN-Konfiguration importieren …"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3220,84 +3275,82 @@ msgstr ""
 "Der Verbindungseditor kann wegen eines unbekannten Fehlers nicht "
 "initialisiert werden."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Neue Verbindung konnte nicht erstellt werden"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Löschen der Verbindung fehlgeschlagen"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sind Sie sicher, dass Sie die Verbindung %s löschen möchten?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Neue Verbindung"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Netzmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Präfix"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Unbenannte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Fehlender Verbindungsname"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Editor wird initialisiert …"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Verbindung kann nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ungültige Einstellung %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3305,36 +3358,36 @@ msgstr ""
 "Der Verbindungseditor konnte benötigte Ressourcen nicht finden (Die .ui-"
 "Datei wurde nicht gefunden)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Alle Änderungen an dieser Verbindung speichern."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Legitimieren, um diese Verbindung für alle Benutzer dieses Rechners zu "
 "speichern."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Verbindung konnte nicht erstellt werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Verbindung konnte nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Unbekannter Fehler beim Erstellen des Dialoges zur Bearbeitung der "
 "Verbindung."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3342,20 +3395,20 @@ msgstr ""
 "Warnung: Die Verbindung hat Eigenschaften, die vom Bereitsteller nicht "
 "unterstützt werden. Sie werden beim Speichern gelöscht."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Fehler beim Initialisieren des Editors"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Hinzufügen der Verbindung fehlgeschlagen"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Fest"
 
 # SELinux
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3363,26 +3416,26 @@ msgstr ""
 "Sicherheitsmarkierungen können verhindern, dass einige Dateien für die "
 "zertifikatbasierte Authentifizierung verwendet werden."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Verbindungs_name"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "E_xportieren …"
 
 # SELinux
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Datei neu markieren"
 
 # SELinux
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Neu markieren"
 
 # SELinux label, oder was ist hier gemeint?
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3391,210 +3444,209 @@ msgstr ""
 "Zertifikat markiert. Möchten Sie die Markierung anpassen?"
 
 # SELinux
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Neu markieren"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nie"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "jetzt"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "vor %d Minute"
 msgstr[1] "vor %d Minuten"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "vor %d Stunde"
 msgstr[1] "vor %d Stunden"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "vor %d Tag"
 msgstr[1] "vor %d Tagen"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "vor %d Monat"
 msgstr[1] "vor %d Monaten"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "vor %d Jahr"
 msgstr[1] "vor %d Jahren"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Verbindung kann nicht gelöscht werden"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Wählen Sie eine Verbindung zum Bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Wählen Sie eine Verbindung zum Löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Zuletzt verwendet"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Die ausgewählte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Die ausgewählte Verbindung löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Unerkannter Verbindungstyp"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Es ist unbekannt, wie die »%s«-Verbindungen importiert werden können"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Fehler beim Importieren der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Fehler beim Erstellen der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Verbindungstyp nicht angegeben."
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Es sind keine VPN-Plugins installiert."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Es ist unbekannt, wie »%s«-Verbindungen erstellt werden können"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Fehler beim Bearbeiten der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Eine Verbindung mit der UUID »%s« konnte nicht gefunden werden"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "Netzwerkverbindungen"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Eine neue Verbindung hinzufügen"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-Sicherheit"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Sichere 802.1X-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "802.1_X-Sicherheit für diese Verbindung verwenden"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAC-Adresse des Bluetooth-Geräts. Beispiel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "Ungültiges Bluetooth-Gerät (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-Verbindung %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth-Typ"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Wählen Sie die Art des Bluetooth-Verbindungsprofils."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Privates Netzwerk"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "_Einwahlverbindung"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Bündel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "Primär"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bündel-Verbindung %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Bündel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brückenverbindung %d"
@@ -3602,36 +3654,36 @@ msgstr "Brückenverbindung %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port einer Brücke"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Brücken-Port-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "Übergeordnete Schnittstelle fehlt"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-Verbindung %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3642,41 +3694,40 @@ msgstr ""
 "Netzwerkgerät zu. Beispiele: »em1«, »3C:97:0E:42:1A:19«, »em1 "
 "(3C:97:0E:42:1A:19)«"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "Ignoriert"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Kabel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet-Gerät"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "Geklonte MAC-Adresse"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Passwort für Aufwecken über LAN"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-Verbindung %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3686,11 +3737,11 @@ msgstr ""
 "Voreinstellung ist »keine reguläre Zone«. Dadurch wird die voreingestellte "
 "Zone der Firewall verwendet. Ist nur relevant, wenn firewalld aktiv ist."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Allgemeine Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3703,166 +3754,158 @@ msgstr ""
 "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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "InfiniBand-Gerät"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-Verbindung %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "IP-Tunnel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP-Tunnel-Verbindung %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatisch (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatisch (VPN), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatisch, nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatisch (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatisch (PPPoE), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatisch (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatisch (DHCP), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Nur per Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Zusätzliche _DNS-Server"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Zusätzliche Suchdomän_en"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4-Routen für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-Einstellungen"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4-Adresse »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4-Adressen-Netzmaske »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4-Gateway »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4-DNS-Server »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatisch, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6-Routen für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-Einstellungen"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6-Adresse »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6-Präfix »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6-Gateway »%s« ist ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6-DNS-Server »%s« ist ungültig"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "MACsec-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC-Verbindung %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Doppelte Sklaven"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Sklaven »%s« und »%s« bewerben dasselbe Gerät »%s«"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3871,27 +3914,27 @@ msgstr ""
 "Sklaven »%s« und »%s« bewerben verschiedene virtuelle Ports (»%s« und »%s«) "
 "auf demselben physikalischen Gerät."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s Sklave %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Benutzerschnittstelle für mobile Breitbandverbindungen konnte nicht geladen "
 "werden."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Typ der mobilen Breitbandverbindung wird nicht unterstützt."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Typ des mobilen Breitbandanbieters auswählen"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3899,7 +3942,7 @@ msgstr ""
 "Wählen Sie die von Ihrem mobilen Breitbandanbieter verwendete Technologie. "
 "Im Zweifelsfall fragen Sie bei Ihrem Dienstanbieter nach."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mein Dienstanbieter verwendet _GSM-basierte Technologien (z.B. GPRS, EDGE, "
@@ -3907,81 +3950,79 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mein Dienstanbieter verwendet C_DMA-basierte Technologien (z.B. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "keine"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "PPP-Legitimierungsmethoden für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-Einstellungen"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Proxy-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Fehler: Datei enthält keine gültige JSON-Konfiguration"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Benutzerschnittstelle für Netzwerk-Team konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Netzwerk-Team %d"
@@ -3989,11 +4030,11 @@ msgstr "Netzwerk-Team %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Netzwerk-Team Anschluss"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr ""
 "Benutzerschnittstelle für Netzwerk-Team-Anschluss konnte nicht geladen "
@@ -4002,57 +4043,56 @@ 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (über »%s«)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Neue Verbindung …"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "VLAN-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan-Elter"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-Verbindung %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Editor-VPN-Plugin für »%s« konnte nicht gefunden werden (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "Fehlgeschlagen, Grund unbekannt"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "VPN-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "VPN-Plugin für »%s« konnte nicht gefunden werden."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-Verbindung %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN-Verbindungstyp wählen"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -4063,7 +4103,7 @@ msgstr ""
 "Liste erscheint, haben Sie möglicherweise nicht das richtige VPN-Plugin "
 "installiert."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4072,7 +4112,7 @@ msgstr ""
 "(AP) zu, der durch die hier eingegebene BSSID spezifiziert wird. Beispiel: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4083,97 +4123,95 @@ msgstr ""
 "Netzwerkgerät zu. Beispiele: »wlan0«, »3C:97:0E:42:1A:19«, »wlan0 "
 "(3C:97:0E:42:1A:19)«"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "WLAN-Gerät"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Funknetzwerkverbindung %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-Schlüssel (Hexadezimal oder ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit-Passphrase"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisches WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Sichere Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden, "
 "weil Funknetzwerkeinstellungen fehlen."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Sicherheit des Funknetzwerks"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Sichere Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "fehlende SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Sicherheit ist mit Ad-Hoc-Modus nicht kompatibel"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Eine Datei mit dem Namen »%s« existiert bereits."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Möchten Sie %s durch die VPN-Verbindung ersetzen, die Sie gerade speichern?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Die VPN-Verbindung konnte nicht exportiert werden"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4184,116 +4222,103 @@ msgstr ""
 "\n"
 "Fehler: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "VPN-Verbindung exportieren …"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Entsperren"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Dieses Gerät automatisch entsperren"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Verbindungsinformationen"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktive Netzwerkverbindungen"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Kein Zertifikat festgelegt"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Kein Schlüssel gesetzt"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Wählen Sie einen Schlüssel für das %s-Zertifikat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "Geheimer %s-_Schlüssel"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "_Passwort des %s-Schlüssels"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Wählen Sie das %s-Zertifikat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "%s-_Zertifikat"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mein Land ist nicht aufgelistet"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nicht aufgelistet"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mein Abrechnungsmodus ist nicht aufgelistet …"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Dienstanbieter"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land oder Region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installiertes GSM-Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installiertes CDMA-Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Irgendein Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Neue mobile Breitbandverbindung"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4301,86 +4326,72 @@ msgstr ""
 "Dieser Assistent hilft Ihnen bei der Einrichtung einer mobilen "
 "Breitbandverbindung über ein UMTS-(3G)-Netzwerk."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Folgende Informationen sind notwendig:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Name Ihres Breitbandanbieters"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Name des Abrechnungsmodus Ihres Dienstanbieters"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(in einigen Fällen) Name des Zugangspunktes für Ihren Abrechnungsmodus:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Eine Verbindung für dieses mobile Brei_tbandgerät einrichten:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Eine mobile Breitbandverbindung einrichten"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Länder- oder Regionsliste:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land oder Region"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Land oder Region des Dienstanbieters auswählen"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Dienstanbieter aus einer _Liste auswählen:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 "Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 "Mein Dienstanbieter verwendet GSM-Technologien (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mein Dienstanbieter verwendet CDMA-Technologien (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Dienstanbieter auswählen"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Abrechnung_smodus auswählen:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Zugangspunkt (APN) zum ausgewählten _Abrechnungsmodus:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4394,13 +4405,11 @@ msgstr ""
 "Im Zweifelsfall sollten Sie Ihren Dienstanbieter nach dem Abrechnungsmodus "
 "Ihres Zugangspunktes fragen."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Abrechnungsmodus wählen"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
@@ -4408,25 +4417,21 @@ msgstr ""
 "eingerichtet:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Ihr Gerät:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Ihr Dienstanbieter:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Ihr Abrechnungsmodus:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4441,141 +4446,140 @@ msgstr ""
 "Breitbandverbindungen zu ändern, wählen Sie »Netzwerkverbindungen« im Menü "
 "System → Einstellungen."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobile Breitbandeinstellungen bestätigen"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(keine)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Schlüssel in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Zertifikat in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Aus _Datei auswählen …"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Wählen Sie ein %s-Zertifikat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "_Passwort des %s-Zertifikats"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Fehler beim Anmelden: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Fehler beim Öffnen einer Sitzung: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "Token _entsperren"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Ausgestellt von"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Geben Sie die PIN %s ein"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "PIN me_rken"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Passwort nur für diesen Benutzer speichern"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Passwort für alle Benutzer speichern"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Jedes Mal nach diesem Passwort fragen"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Das Passwort ist nicht erforderlich"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Passwörter _zeigen"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Tertiäres Passwort:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundäres Passwort:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Klicken Sie zum Verbinden"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Neu …"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisches WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "E_rzeugen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4583,36 +4587,36 @@ msgstr ""
 "Es werden Passwörter oder Schlüssel für die Verschlüsselung benötigt, um "
 "sich mit dem Funknetzwerk »%s« zu verbinden."
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Neues Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 "Bitte geben Sie den Namen des Funknetzwerks ein, das Sie erstellen möchten."
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Mit einem verborgenen Funknetzwerk verbinden"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgenes Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4620,44 +4624,52 @@ msgstr ""
 "Bitte geben Sie den Namen und die Sicherheitseinstellungen des verborgenen "
 "Funknetzwerks ein, mit dem Sie sich verbinden möchten."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "_Sicherheit des Funknetzwerks"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "_Verbindung"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "WLAN-_Adapter"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr ""
 "Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Dienstanbieter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Länder- oder Regionsliste:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land oder Region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kabelgebunden"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC-Mesh-Netzwerk"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4667,13 +4679,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s-%s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4681,27 +4693,27 @@ msgstr ""
 "Entweder fehlt ein Passwort oder die Verbindung ist ungültig. In letztem "
 "Fall müssen Sie die Verbindung zuerst mit nm-connection-editor bearbeiten"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Sicherheit des _Funknetzwerks:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Netzwerkname:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "_Verbindung:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Funknetzwerkk_arte:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4709,7 +4721,7 @@ msgstr ""
 "Dieses Programm ist eine Komponente von NetworkManager (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4717,338 +4729,336 @@ msgstr ""
 "Es ist nicht für die Befehlszeileninteraktion bestimmt, sondern für den "
 "Betrieb innerhalb der GNOME-Arbeitsumgebung."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nicht aktiviert"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nicht angemeldet"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimnetzwerk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Heimnetzwerk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "Suche läuft"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "Registrierung abgelehnt"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s-Roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (Roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming-Netzwerk (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Roaming-Netzwerk"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-Code für SIM-Karte »%s« auf »%s«"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-Code erforderlich"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Für das mobile Breitbandgerät ist ein PIN-Code erforderlich"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "Roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Verbindung mit %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM-Zertifikate (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM-, oder PKCS#12-Privatschlüssel (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "Nicht definierter Fehler in der 802.1X-Sicherheit (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "Kein CA-Zertifikat gewählt"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "Die gewählte Datei mit dem CA-Zertifikat ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC-Datei fehlt"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "PAC-Datei wählen"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-Dateien (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Legitimiert"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Beide"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Anony_me Identität"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "_PAC-Datei"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "I_nnere Legitimierung"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Automatische PAC-Bereitstellung erlauben"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP-Benutzername fehlt"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP-Passwort fehlt"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA-Zertifikat igno_rieren"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "_PEAP-Version"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Suffix des Namens des Serverzertifikats."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domäne"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "EAP-Benutzername fehlt"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "EAP-Passwort fehlt"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit-Passphrase"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "Passwörter _zeigen"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS-Identität fehlt"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "Kein Benutzerzertifikat gewählt"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "Die gewählte Datei mit dem Benutzerzertifikat ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "kein Schlüssel ausgewählt"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "Die gewählte Schlüsseldatei ist nicht vorhanden"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "_Identität"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (kein EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Unbekannter Fehler beim Überprüfen der 802.1X-Sicherheit"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Getunneltes TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Geschütztes EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "_Legitimierung"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "LEAP-Benutzername fehlt"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "LEAP-Passwort fehlt"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "WEP-Schlüssel fehlt"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "Ungültiger WEP-Schlüssel: Schlüssel der Länge %zu darf nur hexadezimale "
 "Stellen enthalten"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -5056,7 +5066,7 @@ msgstr ""
 "Ungültiger WEP-Schlüssel: Schlüssel der Länge %zu darf nur ASCII-Zeichen "
 "enthalten"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5065,39 +5075,39 @@ msgstr ""
 "Ungültiger WEP-Schlüssel: Falsche Schlüssellänge %zu. Ein Schlüssel muss "
 "entweder die Länge 5/13 (ASCII) oder 10/26 (hexadezimal) haben"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "Ungültiger WEP-Schlüssel: Passphrase darf nicht leer sein"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "Ungültiger WEP-Schlüssel: Passphrase muss kürzer als 64 Zeichen sein"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Offenes System"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Gemeinsamer Schlüssel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Vorgabe)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Schlüssel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Schlüssel an_zeigen"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP-Inde_x"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5106,12 +5116,21 @@ msgstr ""
 "Ungültiger WPA-PSK: Schlüssellänge %zu ist unzulässig. Muss [8,63] Bytes "
 "oder 64 hexadezimale Stellen haben"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "Ungültiger WPA-PSK: Schlüssel kann nicht als 64-Byte-hexadezimal "
 "interpretiert werden"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Typ"
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (Vorgabe)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignoriert"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Aktive Netzwerkverbindungen"
diff --git a/po/dz.po b/po/dz.po
index b32a5a72..00a15a71 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.pot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2007-03-16 09:28+0530\n"
 "Last-Translator: sonam pelden <sonaa_peldn@yahoo.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -20,234 +21,254 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
-msgid "Network Connections"
-msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+msgid "Advanced Network Configuration"
+msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "བདེན་བཤད:"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "མཐུད། (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལུ་མཐུད་མ་ཚུགས།"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ང་ལུ་ལོག་དྲན་བསྐུལ་མ་འབད། (_D)"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -255,7 +276,7 @@ msgid ""
 "interrupted."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -263,14 +284,14 @@ msgid ""
 "interrupted."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,14 +301,14 @@ msgstr ""
 "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
 "པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +317,7 @@ msgstr ""
 "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
 "པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,28 +326,28 @@ msgstr ""
 "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
 "པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -334,20 +355,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཕྲིན་དོན་"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -358,7 +379,7 @@ msgstr ""
 "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
 "པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -367,601 +388,628 @@ msgid ""
 "%s"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 #, fuzzy
 msgid "Disconnect"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 #, fuzzy
 msgid "No network devices available"
 msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཐོབ་མ་ཚུགས་"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འབད... (_C)"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་འདི་ལཱ་མི་འབད་བས་"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མེད་བཟོ་ཡོདཔ་"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ། (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "རླུང་འཕྲིན་ལྕོགས་ཅན་བཟོ། (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "སྐོར་ལས། (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "ཁྱོད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'ལུ་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ཡོངས་འབྲེལ་མཐུན་ལམ་འདི་ མཐུད་ལམ་བཏོག་ཡོདཔ།"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 #, fuzzy
 msgid "You are now connected to the mobile broadband network."
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'གི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་གྲ་སྒྲིག་འབད་དོ..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'གི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་གྲ་སྒྲིག་འབད་དོ..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 #, fuzzy
 msgid "DSL authentication"
 msgstr "བདེན་བཤད:"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 msgstr[1] "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མེད་བཟོ་ཡོདཔ་"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "ཁྱོད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'ལུ་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ཅི་མེད་"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "ཨའི་པི་ཁ་བྱང་"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "སབ་ནེཊི་གདོང་ཁེབས"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, fuzzy, c-format
 msgid "Ethernet (%s)"
 msgstr "ཝའིརཌི་ཨི་ཐར་ནེཊི་(%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ངོས་འདྲ་བ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "སྲ་ཆས་ཁ་བྱང་"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "འདྲེན་བྱེད"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "མགྱོགས་ཚད"
 
-#: ../src/applet-dialogs.c:600
+#: src/applet-dialogs.c:616
 #, fuzzy
-msgid "Security:"
+msgid "Security"
 msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ཆོག་ཡིག:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "དབྱེ་བ:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "ལག་ལེན་པའི་མིང་:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Copyright © 2004-2006 Red Hat, Inc.\n"
 "Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "ཁྱོད་རའི་ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཚུ་དང་མཐུད་ལམ་ཚུ་འཛིན་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་  བརྡ་བསྐུལ་མངའ་ཁོངས་ཨེཔ་"
 "ལེཊི།"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "སྐད་བསྒྱུར་པའི་-ངོ་བསྟོད་ཚུ་"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -970,33 +1018,33 @@ msgstr ""
 "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཏི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་འདི་ཐོབ་མ་"
 "ཚུགས་)ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས།"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ཆོག་ཡིག:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1052,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1030,89 +1078,96 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "མཐུད་ལམ་བརྡ་དོན་"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1120,652 +1175,799 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "པི་ཨེ་པི་"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "ངོས་འདྲ་བ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
-msgstr ""
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
+msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ། (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr ""
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "སྲ་ཆས་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "མཐུད་ལམ་འཛོལ་བ་ལུ་བརྟན་  ཝི་པི་ཨེན་མཐུད་ལམ་ '%s' འགོ་བཙུགས་མ་ཚུགས།"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
-msgid "_Username:"
+msgid "_Username"
 msgstr "ལག་ལེན་པའི་མིང་:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 #, fuzzy
 msgid "Sho_w password"
 msgstr "ཆོག་ཡིག་སྟོན་"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
-msgid "_Password:"
+msgid "_Password"
 msgstr "ཆོག་ཡིག:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ངོས་འདྲ་བ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ངོས་འདྲ་བ:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ངོས་འདྲ་བ:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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 ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
+msgstr "ཆོག་ཡིག་སྟོན་"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
-msgid "_Speed:"
+msgid "_Speed"
 msgstr "མགྱོགས་ཚད:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "ཅི་མེད་"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
+msgid "_Metered connection"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1773,1137 +1975,1243 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "མཐུད། (_o)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ངོས་འདྲ་བ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
-msgid "_Method:"
+msgid "_Method"
 msgstr "ཨི་ཨེ་པི་ཐབས་ལམ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+#, fuzzy
+msgid "EAP"
+msgstr "PEAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "བདེན་བཤད:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
-msgstr ""
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
+msgstr "བདེན་བཤད:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ཨི་ཨེ་པི་ཐབས་ལམ:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ཅི་མེད་"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ཨི་ཨེ་པི་ཐབས་ལམ:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
+
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "TKIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "ཇི་ཊི་སི་"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "སྲ་ཆས་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "སྲ་ཆས་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "ངོས་འདྲ་བ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "ངོས་འདྲ་བ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "བདེན་བཤད:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 #, fuzzy
 msgid "_MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 #, fuzzy
 msgid "MSCHAP v_2"
 msgstr "MSCHAPV2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-#, fuzzy
-msgid "Cannot import VPN connection"
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
-
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "སྲ་ཆས་ཁ་བྱང་:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 #, fuzzy
 msgid "Connection delete failed"
 msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 #, fuzzy
 msgid "Address"
 msgstr "ཨའི་པི་ཁ་བྱང་:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -2912,255 +3220,298 @@ msgstr ""
 "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཏི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་འདི་ཐོབ་མ་"
 "ཚུགས་)ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས།"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 #, fuzzy
 msgid "Connection add failed"
 msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
-msgid "Connection _name:"
+msgid "Connection _name"
 msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+#, fuzzy
+msgid "Network Connections"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད་འབད། (_L)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
@@ -3168,86 +3519,90 @@ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལ
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ངོས་འདྲ་བ:"
+
+#: src/connection-editor/page-dsl.c:365
 #, fuzzy, c-format
 msgid "DSL connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 #, fuzzy
 msgid "Wake-on-LAN password"
 msgstr "ཆོག་ཡིག་སྟོན་"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 #, fuzzy
 msgid "Default"
 msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3255,276 +3610,272 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 #, fuzzy
 msgid "Automatic (VPN)"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 #, fuzzy
 msgid "Automatic (PPPoE)"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 #, fuzzy
 msgid "Automatic (DHCP)"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 #, fuzzy
 msgid "Automatic, DHCP only"
 msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-#, fuzzy
-msgid "EAP"
-msgstr "PEAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "པི་ཨེ་པི་"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
@@ -3532,182 +3883,180 @@ msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-བིཊི་ ASCII"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 #, fuzzy
 msgid "Dynamic WEP (802.1X)"
 msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 རང་དོན་"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 ཚོང་ལས་"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3715,430 +4064,392 @@ msgid ""
 "Error: %s."
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "མཐུད་ལམ་བརྡ་དོན་"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "ཅི་མེད་"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
+msgid "Sh_ow passwords"
+msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
+msgid "_Secondary Password:"
+msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Password:"
+msgstr "ཆོག་ཡིག:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ཅི་མེད་"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལྡེ་མིག་དགོཔ་"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4146,38 +4457,54 @@ msgid ""
 msgstr ""
 "ཁྱོད་རང་བཟོ་དགོ་མནོ་དོ་བཟུམ་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་དང་སྲུང་སྐྱོབ་སྒྲིག་སྟངས་ཚུ་ཐོ་བཀོད་འབད།"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "མཐུད། (_o)"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4187,445 +4514,483 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "མཐུད། (_o)"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད་འབད། (_L)"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr ""
+#: src/wireless-security/eap-method.c:370
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "ཇི་ཊི་སི་"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "བདེན་བཤད:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
-msgid "Anony_mous identity:"
+msgid "Anony_mous identity"
 msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "བདེན་བཤད:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-#, fuzzy
-msgid "C_A certificate:"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "ཆོག་ཚིག་སྟོན་"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ངོ་རྟགས:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "བདེན་བཤད:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "རིམ་ལུགས་ཁ་ཕྱེ་"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
+
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
-msgid "_Key:"
+msgid "_Key"
 msgstr "ལྡེ་མིག:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 #, fuzzy
 msgid "Sho_w key"
 msgstr "ལྡེ་མིག་སྟོན་"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
-msgid "_Type:"
+msgid "_Type"
 msgstr "དབྱེ་བ:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
+
+#, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "མཐུད་ལམ་འཛོལ་བ་ལུ་བརྟན་  ཝི་པི་ཨེན་མཐུད་ལམ་ '%s' འགོ་བཙུགས་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
+
+#, fuzzy
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
+
+#, fuzzy
+#~ msgid "Active Network Connections"
+#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#, fuzzy
+#~ msgid "C_A certificate:"
+#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
 
@@ -4672,9 +5037,6 @@ msgstr "དབྱེ་བ:"
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "རླུང་འཕྲིན་ཨི་ཐར་ནེཊི་(%s)"
 
-#~ msgid "translator-credits"
-#~ msgstr "སྐད་བསྒྱུར་པའི་-ངོ་བསྟོད་ཚུ་"
-
 #~ msgid ""
 #~ "Copyright © 2004-2005 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
@@ -4838,9 +5200,6 @@ msgstr "དབྱེ་བ:"
 #~ msgid "Select the Private Key File"
 #~ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
 
-#~ msgid "Show passphrase"
-#~ msgstr "ཆོག་ཚིག་སྟོན་"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ཨ་རྟག་རང་བློ་གཏད། (_A)"
 
diff --git a/po/el.po b/po/el.po
index 49e35cd0..7634c460 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,8 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-07-21 12:37+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
 "Language-Team: team@lists.gnome.gr\n"
@@ -24,49 +25,58 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Διαχείριση των συνδέσεων δικτύου"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Συνδέσεις δικτύου"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "_Χειροκίνητη σύνδεση"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Διαχείριση και αλλαγή ρυθμίσεων των συνδέσεων δικτύου"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Απενεργοποίηση ειδοποιήσεων σύνδεσης"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε συνδέεστε "
 "σε δίκτυο."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Απενεργοποίηση ειδοποιήσεων αποσύνδεσης"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
 "αποσυνδέεστε από ένα δίκτυο."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Απενεργοποίηση ειδοποιήσεων VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -74,53 +84,54 @@ msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε "
 "αποσυνδέεστε από ένα δίκτυο VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Απενεργοποίηση ειδοποιήσεων διαθέσιμων δικτύων"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις ειδοποιήσεις όποτε υπάρχουν "
 "διαθέσιμα δίκτυα Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Σφραγίδα"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Χρησιμοποιείται για να καθορίζει αν οι ρυθμίσεις πρέπει να μεταφερθούν σε "
 "νέα έκδοση."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Απενεργοποίηση δημιουργίας ασύρματου δικτύου"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε την δημιουργία adhoc δικτύων "
 "κατά τη χρήση της μικροεφαρμογής."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Εμφάνιση της μικροεφαρμογής στην περιοχή ειδοποιήσεων"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Ορισμός σε ΨΕΥΔΕΣ για απενεργοποίηση εμφάνισης της μικροεφαρμογής στην "
 "περιοχή ειδοποιήσεων."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Παράβλεψη πιστοποιητικού CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -128,7 +139,7 @@ msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
 "τα πιστοποιητικά CA στην πιστοποίηση EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -136,130 +147,143 @@ msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
 "τα πιστοποιητικά CA στην 2η φάσης της EAP πιστοποίησης."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Εφαρμογή NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Δεν υπάρχει σύνδεση δικτύου"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "- Ιδιότητες VPN NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Πιστοποίηση 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Σύν_δεση"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Ό_νομα δικτύου:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Αποτυχία προσθήκης/ενεργοποίησης σύνδεσης"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Αποτυχία σύνδεσης"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Αποτυχία αποσύνδεσης της συσκευής"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Αποτυχία αποσύνδεσης"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Απέτυχε η ενεργοποίηση της σύνδεσης"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Να μην εμφανιστεί αυτό το μήνυμα ξανά"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "\n"
 "Αποσυνδεθήκατε από το VPN '%s', γιατί διακόπηκε η σύνδεση δικτύου."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί διακόπηκε η σύνδεση δικτύου."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί η υπηρεσία VPN διακόπηκε ανεξήγητα."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί η υπηρεσία VPN επέστρεψε άκυρες ρυθμίσεις."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί έληξε το χρονικό όριο σύνδεσης."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "Απέτυχε η σύνδεση VPN '%s', γιατί δεν έγινε έγκαιρη εκκίνηση της υπηρεσίας "
 "VPN."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί απέτυχε η εκκίνηση της υπηρεσίας VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί δεν βρέθηκαν έγκυρα VPN secrets."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί τα VPN secrets ήταν άκυρα."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -353,7 +377,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s'."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -364,19 +388,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Έχει πραγματοποιηθεί επιτυχώς η σύνδεση VPN.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Μήνυμα εισόδου VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Απέτυχε η σύνδεση VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -389,7 +413,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -402,562 +426,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "η συσκευή δεν είναι έτοιμη (λείπει υλικολογισμικό)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "η συσκευή δεν είναι έτοιμη"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "χωρίς σύνδεση"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Αποσύνδεση"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "δε γίνεται διαχείριση της συσκευής"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Δε βρέθηκαν συσκευές δικτύου"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Συνδέσεις _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Ρύθμιση VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Προσθήκη μιας νέας σύνδεσης VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Ο NetworkManager δεν εκτελείται..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Δικτύωση απενεργοποιημένη"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Ενεργοποίηση _δικτύωσης"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Ενεργοποίηση _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Ενεργοποίηση _κινητής ευρυζωνικής"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Ενεργοποίηση ει_δοποιήσεων"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Π_ληροφορίες σύνδεσης"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Επεξεργασία συνδέσεων..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "Πε_ρί"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Συνδεθήκατε στο '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Χωρίς σύνδεση"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Αποσυνδεθήκατε από το δίκτυο."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Προετοιμασία της σύνδεσης '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Ζητείται διεύθυνση δικτύου για το '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Η σύνδεση '%s' είναι ενεργή"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Εκκίνηση της σύνδεσης VPN '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση VPN '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Ζητείται διεύθυνση VPN για το '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Η σύνδεση VPN '%s' είναι ενεργή"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Δεν υπάρχει σύνδεση δικτύου"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Μικροεφαρμογή NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Σφάλμα κωδικού PUK· παρακαλούμε επικοινωνήστε με τον πάροχό σας."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Σφάλμα κωδικού PIN· παρακαλούμε επικοινωνήστε με τον πάροχό σας."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Αποστολή κωδικού ξεκλειδώματος..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Κινητή ευρυζωνική (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Κινητή ευρυζωνική"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Διαθέσιμα"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Νέα κινητή ευρυζωνική σύνδεση"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Η σύνδεση επιτεύχθηκε"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Συνδεθήκατε στο κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Είστε πλέον εγγεγραμμένος στο οικιακό δίκτυο."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Είστε πλέον εγγεγραμμένος σε ένα δίκτυο περιαγωγής."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Συνδεθήκατε στο κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Προετοιμασία της κινητής ευρυζωνικής σύνδεσης '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Ρύθμιση της κινητής ευρυζωνικής σύνδεσης '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Απαιτείται πιστοποίηση για την κινητή ευρυζωνική σύνδεση '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Η κινητή ευρυζωνική σύνδεση '%s' είναι ενεργή"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Αυτόματο Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Δίκτυα Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Δίκτυο Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Δίκτυα Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Δίκτυο Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Συνδεθήκατε στο δίκτυο Ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Προετοιμασία της σύνδεσης δικτύου Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Ρύθμιση της σύνδεσης δικτύου Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Απαιτείται πιστοποίηση του χρήστη για την σύνδεση δικτύου Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ζητείται διεύθυνση δικτύου Ethernet για το '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Η σύνδεση δικτύου Ethernet '%s' είναι ενεργή"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Πιστοποίηση DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Δημιουργία νέου δικτύου Wi-Fi"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Αποτυχία προσθήκης νέας σύνδεσης"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Δίκτυα Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Δίκτυο Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Δίκτυο Wi-Fi "
 msgstr[1] "Δίκτυα Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Το Wi-Fi είναι ανενεργό"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Το Wi-Fi είναι ανενεργό από τον διακόπτη"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Περισσότερα δίκτυα"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Διαθέσιμα δίκτυα Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Χρησιμοποιήστε το μενού δικτύου για να συνδεθείτε σε δίκτυο Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Συνδεθήκατε στο δίκτυο Wi-Fi '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Προετοιμασία σύνδεσης δικτύου Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Ρύθμιση της σύνδεσης δικτύου Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Απαιτείται πιστοποίηση του χρήστη για το δίκτυο Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Αιτείται διεύθυνση δικτύου Wi-Fi για το '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Η σύνδεση δικτύου Wi-Fi '%s' είναι ενεργή: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Η σύνδεση δικτύου Wi-Fi '%s' είναι ενεργή"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Αποτυχία ενεργοποίησης της σύνδεσης"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Σφάλμα εμφάνισης πληροφοριών σύνδεσης:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Δυναμικό WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Διευθύνσεις"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Καμία"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (προεπιλογή)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Άγνωστη"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Διεύθυνση IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Διεύθυνση μετάδοσης"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Μάσκα υποδικτύου"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Πρωτεύον DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Δευτερεύον DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Τριτεύον DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Γενικά"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Διεύθυνση υλικού"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Οδηγός"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Ταχύτητα"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Ασφάλεια:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Προεπιλεγμένη διαδρομή"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Αγνόηση"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Κωδικός πρόσβασης:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Τύπος VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Πύλη VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Όνομα χρήστη VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Κείμενο εισόδου VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Σύνδεση βάσης"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Δε βρέθηκαν έγκυρες ενεργές συνδέσεις!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -965,18 +1014,30 @@ msgstr ""
 "Πνευματικά δικαιώματα © 2005-2008 Novell, Inc.\n"
 "και πολλοί άλλοι προγραμματιστές της κοινότητας και μεταφραστές"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Μικροεφαρμογή για τη διαχείριση των συσκευών και των συνδέσεων του δικτύου "
 "σας."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Ιστοσελίδα του NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"Ελληνική μεταφραστική ομάδα GNOME\n"
+"  Νίκος Χαρωνιτάκης <charosn@her.forthnet.gr>\n"
+"  Κώστας Παπαδήμας <pkst@gnome.org>\n"
+"  Δημήτρης Γλέζος <dimitris@glezos.com>\n"
+"  Σίμος Ξενιτέλλης <simos@gnome.org>\n"
+"  Τζένη Πετούμενου <epetoumenou@gmail.com>\n"
+"\n"
+"Για περισσότερα δείτε http://www.gnome.gr/"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -984,33 +1045,33 @@ msgstr ""
 "Η μικροεφαρμογή NetworkManager δεν μπόρεσε να βρει κάποιους απαιτούμενους "
 "πόρους (δε βρέθηκε το αρχείο .ui)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Λείπουν πόροι"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Κωδικός πρόσβασης κινητού ευρυζωνικού δικτύου"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Απαιτείται κωδικός πρόσβασης για σύνδεση στο '%s'."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1020,25 +1081,25 @@ msgstr ""
 "χρησιμοποιηθεί."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Κωδικός PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Εμφάνιση κωδικού PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1048,35 +1109,42 @@ msgstr ""
 "χρησιμοποιηθεί."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Κωδικός PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Νέος κωδικός PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Εισάγετε ξανά τον κωδικό PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Εμφάνιση κωδικών 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Πληροφορίες σύνδεσης"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Αδυναμία δημιουργίας σύνδεσης DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1085,41 +1153,41 @@ msgstr ""
 "Οι διευθύνσεις IP επιτρέπουν την αναγνώριση του υπολογιστή σας στο δίκτυο. "
 "Πατήστε το κουμπί \"Προσθήκη\" για να προσθέσετε μια διεύθυνση IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Α_γνόηση διαδρομών που ελήφθησαν αυτόματα"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Χρ_ησιμοποιήστε αυτή τη σύνδεση μόνο για πόρους του δικτύου της"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1127,16 +1195,16 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, αυτή η σύνδεση δε θα χρησιμοποιείται ποτέ ως "
 "προεπιλεγμένη σύνδεση δικτύου."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Δημιουργία…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Επιλογή τύπου σύνδεσης"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1148,85 +1216,100 @@ msgstr ""
 "Εάν δημιουργείτε ένα VPN και η σύνδεση VPN που θέλετε να δημιουργήσετε δεν "
 "εμφανίζεται στη λίστα, ίσως να μην έχετε εγκατεστημένο το σωστό πρόσθετο VPN."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Υπηρεσία:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Ενεργό αντίγραφο ασφαλείας"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Εκπομπή"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Προσαρμοστική μετάδοση εξισορρόπησης φορτίου"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Προσαρμοστική εξισορρόπηση φορτίου"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (συνιστώμενο)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Συζευγμένες _συνδέσεις:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Κατάσταση:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Σ_υχνότητα παρακολούθησης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Όνομα _διεπαφής:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Παρακολούθηση συ_νδέσμου:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Προορισμοί ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1234,19 +1317,22 @@ msgstr ""
 "Μια διεύθυνση IP ή μια λίστα διευθύνσεων IP που χωρίζεται με κόμμα, για "
 "αναζήτηση κατά τον έλεγχο της κατάστασης συνδέσμου."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Καθυστέρηση _σύνδεσης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Καθυστέρηση _αποσύνδεσης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Πρωτεύον:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1254,105 +1340,163 @@ 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Κόστος διαδρομής:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Προτεραιότητα:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Κατάσταση _φουρκέτας:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Γεφυρωμένες _συνδέσεις:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Καθυστέρηση _προώθησης:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Χρόνος _χαιρετισμού:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Ενεργοποίηση _δικτύωσης"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Ενεργοποίηση _STP (πρωτόκολλο δένδρου κάλυψης)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Μέγιστη ηλικία:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Χρόνος _ωρίμανσης:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "αυτόματα"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "προεπιλεγμένη"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Ενεργοποίηση"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1364,198 +1508,238 @@ msgstr ""
 "χαρακτηριστικό είναι γνωστό ως κλωνοποίηση ή προστασία εκχώρησης MAC. "
 "Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Διεύθυνση"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Διεύθυνση"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "Ό_νομα διεπαφής VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Διεύθυνση υλικού:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Οποιαδήποτε συσκευή"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Απέτυχε η ενημέρωση των μυστικών της σύνδεσης εξαιτίας άγνωστου σφάλματος."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Χρήση γεφύρωσης κέντρου δεδομένων (DCB) για αυτήν τη σύνδεση"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Έλεγχος ροής"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Γνώρισμα"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Γνωστοποίηση"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Πρόθυμος"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Επιλογές..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Ομάδες προτεραιότητας"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Έλεγχος ροής προτεραιότητας"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση της προτεραιότητας για μετάδοση παύσης, για "
 "κάθε προτεραιότητα χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Προτεραιότητα:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Κλάση κυκλοφορίας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Αυστηρό εύρος ζώνης:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Εύρος ζώνης προτεραιότητας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Εύρος ζώνης ομάδας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Αναγνωριστικό ομάδας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Εισάγετε το αναγνωριστικό ομάδας προτεραιότητας για κάθε προτεραιότητα "
 "χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1564,246 +1748,307 @@ msgstr ""
 "προτεραιότητας μπορεί να χρησιμοποιήσει. Το άθροισμα όλων των ομάδων πρέπει "
 "να είναι συνολικά 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Εισάγετε το ποσοστό τους εύρους ζώνης ομάδας προτεραιότητας που κάθε χρήστης "
 "προτεραιότητας μπορεί να χρησιμοποιήσει."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση αυστηρού εύρους ζώνης για κάθε προτεραιότητα "
 "χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Εισάγετε την κλάση κυκλοφορίας για κάθε προτεραιότητα χρήστη."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Όνομα _χρήστη:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Υπηρεσία:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Εμ_φάνιση κωδικού πρόσβασης"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "Κωδικός _πρόσβασης:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Διεπαφή"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Γονική διεπαφή:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Γονική διεπαφή:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Αυτόματα"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Συστραμμένο ζεύγος (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Διεπαφή μονάδων σύνδεσης (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Διεπαφή ανεξάρτητη από το μέσο (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Αγνόηση"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Χειροκίνητα"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Θύρα:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Υπηρεσία:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Προεπιλογή"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Αγνόηση"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Εκπομπή"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "Τα_χύτητα:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Πλήρως αμ_φίδρομo"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Αυτόματη σύνδεση με _VPN όταν χρησιμοποιείται αυτή η σύνδεση"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Ναι"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Όχι"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Όλοι οι _χρήστες μπορούν να συνδεθούν σε αυτό το δίκτυο"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Αυτόματη σύνδεση σε αυτό το δίκτυο όταν είναι διαθέσιμο"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Αυτόματη σύνδεση με _VPN όταν χρησιμοποιείται αυτή η σύνδεση"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Π_ληροφορίες σύνδεσης"
+msgid "Firewall _zone"
+msgstr "_Ζώνη τείχους προστασίας:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Συνδέσεις σε _ομάδες:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Α_υτόματη σύνδεση"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Ζώνη τείχους προστασίας:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1812,7 +2057,7 @@ msgstr ""
 "Οι διευθύνσεις IP επιτρέπουν την αναγνώριση του υπολογιστή σας στο δίκτυο. "
 "Πατήστε το κουμπί \"Προσθήκη\" για να προσθέσετε μια διεύθυνση IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1820,128 +2065,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Αυτόματα, μόνο διευθύνσεις"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Διευθύνσεις"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Κατάσταση _μεταφοράς:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Αυτοδύναμο πακέτο"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Συνδεδεμένο"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Κατάσταση _μεταφοράς:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Όνομα συσκευής + αριθμός"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Κατάσταση:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Αυτόματα με χειροκίνητες ρυθμίσεις DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Τοπική σύνδεση"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Κοινή χρήση με άλλους υπολογιστές"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Μέθοδος:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1952,8 +2201,8 @@ msgstr ""
 "προσαρμόζει την ρύθμιση του υπολογιστή σας. Αν χρησιμοποιείται ένα "
 "αναγνωριστικό πελάτη DHCP, εισάγετε το εδώ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1961,25 +2210,26 @@ msgstr ""
 "Οι τομείς χρησιμοποιούνται για την ανάλυση του ονόματος κεντρικών "
 "υπολογιστών. Χρησιμοποιήστε κόμματα για τον διαχωρισμό πολλαπλών τομέων."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "Ταυτότητα πελάτη D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Τομείς ανα_ζήτησης:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Διακομιστές _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1989,12 +2239,12 @@ msgstr ""
 "τον διαχωρισμό των διευθύνσεων των πολλαπλών διευθύνσεων διακομιστή ονόματος "
 "τομέα."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 "Απαιτείται IPv_4 διευθυνσιοδότηση για την ολοκλήρωση αυτής της σύνδεσης"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2002,25 +2252,35 @@ msgstr ""
 "Κατά τη σύνδεση σε δίκτυα με IPv6, επιτρέπει στη σύνδεση να ολοκληρωθεί αν "
 "αποτύχει η διαμόρφωση IPv4 αλλά επιτύχει η διαμόρφωση IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "Διαδ_ρομές…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Ενεργοποιημένο (προτιμήσετε δημόσια διεύθυνση)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Ενεργοποιημένο (προτιμήσετε προσωρινή διεύθυνση)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Ενεργοποίηση"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2032,16 +2292,21 @@ msgstr ""
 "τομέα. Οι συνδεμένες τοπικές διευθύνσεις θα έχουν εμβέλεια αυτόματα στη "
 "διεπαφή σύνδεσης."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Επεκτάσεις α_πορρήτου IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 "Απαιτείται IPv_6 διευθυνσιοδότηση για την ολοκλήρωση αυτής της σύνδεσης"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2049,757 +2314,864 @@ msgstr ""
 "Κατά τη σύνδεση σε δίκτυα με IPv4, επιτρέπει στη σύνδεση να ολοκληρωθεί αν "
 "αποτύχει η διαμόρφωση IPv6 αλλά επιτύχει η διαμόρφωση IPv4."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Μετρικό"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "Εισα_γωγή"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Βασικό"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Αριθ_μός:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Αναγνωριστικό _δικτύου:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Αλλαγή..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Να επιτρέπεται η _περιαγωγή αν το οικιακό δίκτυο δεν είναι διαθέσιμο"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Εμ_φάνιση κωδικών πρόσβασης"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Επιτρεπτές μέθοδοι:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Ρύθμιση _μεθόδων…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Συμπίεση"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Χρήση κρυπτο_γράφησης Point-to-Point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Να _απαιτείται κρυπτογράφηση 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Χρήση _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Να επιτρέπεται η συμπίεση _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Να επιτρέπεται η συμπίεση _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Χρήση συμπίεσης κεφα_λίδων TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Αποστολή πακέτων _echo PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Μέθοδος:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Καμία"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Ε_ισαγωγή διαμόρφωσης ομάδας από αρχείο..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Μέθοδος:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Για προχωρημένους"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Δίκτυα Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Προτεραιότητα:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Προτεραιότητα:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Προτεραιότητα:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Ιδιωτικό κ_λειδί:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Καθυστέρηση _σύνδεσης:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Καθυστέρηση _αποσύνδεσης:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Προορισμοί ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Προορισμοί ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Ε_ισαγωγή διαμόρφωσης ομάδας από αρχείο..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Διαμόρφωση _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "_Χειροκίνητη σύνδεση"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Εύρος ζώνης ομάδας:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Προτεραιότητα"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Συνδέσεις σε _ομάδες:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Διεύθυνση υλικού:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Διεύθυνση υλικού:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Προτεραιότητα:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Ισ_χύς μετάδοσης:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Ισ_χύς μετάδοσης:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Γονική διεπαφή:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "Ό_νομα διεπαφής VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_Αναγνωριστικό VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Όνομα συσκευής + αριθμός"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + αριθμός"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Α_σφάλεια:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Ισ_χύς μετάδοσης:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Ρυθμός:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Κα_νάλι:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Ζώνη:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Επιτρεπτές μέθοδοι πιστοποίησης"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Επεκτάσιμο πρωτόκολλο πιστοποίησης "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω κωδικού πρόσβασης"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας της Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας της Microsoft έκδοση 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2809,190 +3181,185 @@ msgstr ""
 "όλες τις μεθόδους πιστοποίησης. Αν αποτυγχάνει η σύνδεση, δοκιμάστε να "
 "απενεργοποιήσετε κάποιες μεθόδους."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Δεσμός"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Ομάδα"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Γέφυρα"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Το πρόσθετο VPN απέτυχε να εισάγει σωστά τη σύνδεση VPN\n"
-"\n"
-"Σφάλμα: δεν υπάρχει τύπος υπηρεσίας VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Αδύνατη η εισαγωγή της σύνδεσης VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του αρχείου '%s', ή το αρχείο δε διαθέτει "
-"αναγνωρίσιμες πληροφορίες σύνδεσης VPN\n"
+"Το πρόσθετο VPN απέτυχε να εισάγει σωστά τη σύνδεση VPN\n"
 "\n"
-"Σφάλμα: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Άγνωστο σφάλμα"
+"Σφάλμα: δεν υπάρχει τύπος υπηρεσίας VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Επιλέξτε το αρχείο που θέλετε να εισάγετε"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Εικονικό"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Εισαγωγή αποθηκευμένης διαμόρφωσης VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Απέτυχε η αρχικοποίηση του διαλόγου επεξεργασίας συνδέσεων για άγνωστο λόγο."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Αδύνατη η δημιουργία νέας σύνδεσης"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Απέτυχε η διαγραφή της σύνδεσης"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τη σύνδεση %s;"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Συνδέσεις _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Μάσκα δικτύου"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Πύλη δικτύου"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Μετρικό"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Πρόθεμα"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Επεξεργασία σύνδεσης χωρίς όνομα"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Ό_νομα σύνδεσης:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Σφάλμα αρχικοποίησης επεξεργασίας"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Απέτυχε η προσθήκη σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3000,55 +3367,52 @@ msgstr ""
 "Ο επεξεργαστής σύνδεσης δεν μπόρεσε να βρει κάποιους απαιτούμενους πόρους "
 "(δε βρέθηκε το αρχείο .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Α_ποθήκευση"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Αποθήκευση αλλαγών που έγιναν σε αυτή τη σύνδεση."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Απαιτείται πιστοποίηση για την αποθήκευση αυτής της σύνδεσης για όλους τους "
 "χρήστες του συστήματος."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Αδύνατη η δημιουργία σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Αδύνατη η επεξεργασία της σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Άγνωστο σφάλμα κατά τη δημιουργία διαλόγου επεξεργαστή σύνδεσης."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Σφάλμα αρχικοποίησης επεξεργασίας"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Απέτυχε η προσθήκη σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3057,201 +3421,247 @@ msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
 "τα πιστοποιητικά CA στην πιστοποίηση EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Ό_νομα σύνδεσης:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "Ε_ξαγωγή..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "ετικέτα"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "ετικέτα"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ποτέ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "τώρα"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d λεπτό πριν"
 msgstr[1] "%d λεπτά πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ώρα πριν"
 msgstr[1] "%d ώρες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ημέρα πριν"
 msgstr[1] "%d ημέρες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d μήνα πριν"
 msgstr[1] "%d μήνες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d έτος πριν"
 msgstr[1] "%d έτη πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Απέτυχε η προσθήκη σύνδεσης"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Σύνδεση ομάδας %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Σύνδεση ομάδας %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Τελευταία χρήση"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Επεξεργασία της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Απαιτείται πιστοποίηση για την επεξεργασία της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Διαγραφή της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Απαιτείται πιστοποίηση για τη διαγραφή της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Μη υποστηριζόμενος τύπος κινητής ευρυζωνικής σύνδεσης."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Δε γνωρίζω πως μπορούν να πραγματοποιηθούν συνδέσεις τύπου '%s'"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Σφάλμα επεξεργασίας σύνδεσης"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Σφάλμα δημιουργίας σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Απέτυχε η προσθήκη σύνδεσης"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Δεν έχουν εγκατασταθεί πρόσθετα VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Δε γνωρίζω πως μπορούν να πραγματοποιηθούν συνδέσεις τύπου '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Σφάλμα επεξεργασίας σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Δε βρέθηκε σύνδεση με UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Συνδέσεις δικτύου"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Προσθήκη μιας νέας σύνδεσης VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Ασφάλεια 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Αδυναμία φόρτωσης της ασφάλειας 802.1X της διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Χρήση ασφάλειας 802.1_X για αυτή τη σύνδεση"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Αδύνατη η φόρτωση της διεπαφής χρήστη DCB."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "αδυναμία εύρεσης της συσκευής Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Σύνδεση δεσμού %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Δίκτυο Ethernet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Δίκτυο Wi-Fi "
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Αδυναμία φόρτωσης του δεσμού διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Πρωτεύον:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Σύνδεση δεσμού %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Αδυναμία φόρτωσης γέφυρας διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Σύνδεση γέφυρας %d"
@@ -3259,32 +3669,37 @@ msgstr "Σύνδεση γέφυρας %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Θύρα γέφυρας"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Αδυναμία φόρτωσης της θύρας γέφυρας διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Αδύνατη η φόρτωση της διεπαφής χρήστη DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Γονική διεπαφή:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Σύνδεση DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3294,44 +3709,43 @@ msgstr ""
 "Αυτή η επιλογή κλειδώνει αυτή τη σύνδεση στη συσκευή δικτύου που καθορίζεται "
 "από τη μόνιμη διεύθυνση MAC που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Αγνόηση"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Αδυναμία φόρτωσης Ethernet διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Σύνδεση Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3342,11 +3756,11 @@ msgstr ""
 "προεπιλεγμένης ζώνης στο τείχος προστασίας. Είναι χρήσιμο μόνο εάν το τείχος "
 "προστασίας είναι ενεργό."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Αδυναμία φόρτωσης της γενικής διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3357,158 +3771,162 @@ msgstr ""
 "Αυτή η επιλογή κλειδώνει αυτή τη σύνδεση στη συσκευή δικτύου που καθορίζεται "
 "από τη μόνιμη διεύθυνση MAC που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Αδυναμία φόρτωσης της InfiniBand διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Σύνδεση InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Σύνδεση Ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Αυτόματα (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Αυτόματα, μόνο διευθύνσεις"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Αυτόματα (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Αυτόματα (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Μόνο τοπική σύνδεση"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Επιπλέον διακομιστές _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Επιπλέον τομείς ανα_ζήτησης:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Επεξεργασία των διαδρομών IPv4 για την %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Ρυθμίσεις IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Αυτόματα, μόνο DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Επεξεργασία των διαδρομών IPv6 για την %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Ρυθμίσεις IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Σύνδεση WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Διπλασιασμός υποτελών"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Οι υποτελείς '%s' και '%s' εφαρμόζουν και οι δύο στη συσκευή '%s'"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3517,25 +3935,25 @@ msgstr ""
 "Οι υποτελείς '%s' και '%s' εφαρμόζουν σε διαφορετικές εικονικές θύρες ('%s' "
 "και '%s') της ίδιας φυσικής συσκευής."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s υποτελής %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη κινητής ευρυζωνικής σύνδεσης."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Μη υποστηριζόμενος τύπος κινητής ευρυζωνικής σύνδεσης."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Επιλογή τύπου παρόχου κινητής ευρυζωνικής σύνδεσης"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3544,91 +3962,87 @@ msgstr ""
 "Επιλέξτε την τεχνολογία που χρησιμοποιεί ο πάροχός σας. Αν δεν είστε "
 "σίγουροι, απευθυνθείτε στον πάροχό σας."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Ο πάροχός μου χρησιμοποιεί τεχνολογίες _GSM (π.χ. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες C_DMA (π.χ. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "κανένα"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Επεξεργασία των μεθόδων πιστοποίησης PPP για την %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Ρυθμίσεις PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Αδυναμία φόρτωσης του δεσμού διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Σφάλμα: το αρχείο δεν περιέχει μια έγκυρη διαμόρφωση JSON"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη ομάδας."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Σύνδεση ομάδας %d"
@@ -3636,69 +4050,69 @@ msgstr "Σύνδεση ομάδας %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Θύρα ομάδας"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (μέσα από \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Δεν υπάρχει σύνδεση δικτύου"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Σύνδεση VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Δε βρέθηκε η υπηρεσία πρόσθετου VPN για το '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Δε βρέθηκε η υπηρεσία πρόσθετου VPN για το '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Αποτυχία σύνδεσης"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Δε βρέθηκε η υπηρεσία πρόσθετου VPN για το '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Σύνδεση VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Επιλογή τύπου σύνδεσης VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3709,7 +4123,7 @@ msgstr ""
 "Αν ο τύπος σύνδεσης VPN που επιθυμείτε να δημιουργήσετε δεν εμφανίζεται στη "
 "λίστα, ίσως δεν είναι εγκατεστημένο το κατάλληλο πρόσθετο VPN."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3718,7 +4132,7 @@ msgstr ""
 "Αυτή η επιλογή κλειδώνει αυτήν τη σύνδεση στο σημείο πρόσβασης Wi-Fi (AP) "
 "που καθορίζεται από το BSSID που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3728,96 +4142,94 @@ msgstr ""
 "Αυτή η επιλογή κλειδώνει αυτή τη σύνδεση στη συσκευή δικτύου που καθορίζεται "
 "από τη μόνιμη διεύθυνση MAC που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Οποιαδήποτε συσκευή"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Σύνδεση Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Κλειδί WEP 40/128-bit (Hex ή ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Συνθηματική φράση WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Δυναμικό WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Προσωπικό WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Εταιρικό WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Αδυναμία φόρτωσης της διεπαφής χρήστη ασφάλειας Wi-Fi· λείπει μια ρύθμιση "
 "του δικτύου Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Ασφάλεια Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη ασφάλειας Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Ένα αρχείο με το όνομα \"%s\" υπάρχει ήδη."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Θέλετε να αντικαστήσετε την %s με τη σύνδεση VPN που αποθηκεύετε;"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Αδύνατη η εξαγωγή της σύνδεσης VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3828,222 +4240,106 @@ msgstr ""
 "\n"
 "Σφάλμα: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Εξαγωγή σύνδεσης VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Ξεκλείδωμα"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Αυτόματο ξεκλείδωμα αυτής της συσκευής"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Πληροφορίες σύνδεσης"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Ενεργές συνδέσεις δικτύου"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Επιλέξτε πιστοποιητικό CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Ιδιωτικό κ_λειδί:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Επιλέξτε πιστοποιητικό CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Πιστοποιητικό _χρήστη:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Η κινητή ευρυζωνική σας σύνδεση περιλαμβάνει τις ακόλουθες ρυθμίσεις:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Η συσκευή σας:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Ο πάροχός σας:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Η συνδρομή σας:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Τώρα θα γίνει σύνδεση στον πάροχο κινητής ευρυζωνικής σύνδεσης, "
-"χρησιμοποιώντας τις ρυθμίσεις που επιλέξατε. Αν η σύνδεση αποτύχει, ή αν δεν "
-"έχετε πρόσβαση στους πόρους του δικτύου, ελέγξτε ξανά τις ρυθμίσεις σας. Για "
-"να τροποποιήσετε τις ρυθμίσεις της κινητής ευρυζωνικής σύνδεσης, επιλέξτε "
-"\"Συνδέσεις δικτύου\" από το μενού Σύστημα >> Προτιμήσεις."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Η χώρα μου δεν είναι στη λίστα"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Εκτός λίστας"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Επιλέξτε τη συνδρομή σας:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN (Access Point Name) επιλεγμένης συνδρομής:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Προειδοποίηση: Αν επιλέξετε λάθος συνδρομή, μπορεί να προκύψουν προβλήματα "
-"με τη χρέωση του λογαριασμού σας ή τη συνδεσιμότητα.\n"
-"\n"
-"Αν δεν είστε σίγουροι για τον τύπο συνδρομής σας, ζητήστε το APN της "
-"συνδρομής σας από τον πάροχο."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Επιλέξτε τη συνδρομή σας"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Η συνδρομή μου δεν αναφέρεται..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Επιλέξτε τον πάροχό σας από τη _λίστα:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Πάροχος"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Πάροχος:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Επιλέξτε τον πάροχό σας"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Λίστα χωρών ή περιοχών:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Χώρα ή περιοχή"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Η χώρα μου δεν είναι στη λίστα"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Επιλέξτε τη χώρα ή περιοχή του παρόχου σας"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Εγκατεστημένη συσκευή GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Εγκατεστημένη συσκευή CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Οποιαδήποτε συσκευή"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Νέα κινητή ευρυζωνική σύνδεση"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4051,193 +4347,272 @@ msgstr ""
 "Ο βοηθός αυτός σας επιτρέπει να συνδεθείτε εύκολα σε ένα κινητό ευρυζωνικό "
 "(3G) δίκτυο."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Θα χρειαστείτε τις ακόλουθες πληροφορίες:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Το όνομα του παρόχου της σύνδεσης σας"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Το όνομα της συνδρομής σας"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(σε κάποιες περιπτώσεις) Το APN (Όνομα σημείου πρόσβασης) της ευρυζωνικής "
 "συνδρομής σας"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Δημιουργία σύνδεσης για την _ακόλουθη συσκευή:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Οποιαδήποτε συσκευή"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Ρύθμιση κινητής ευρυζωνικής σύνδεσης"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Νέα κινητή ευρυζωνική σύνδεση"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Χώρα ή περιοχή"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Επιλέξτε τη χώρα ή περιοχή του παρόχου σας"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Επιλέξτε τον πάροχό σας από τη _λίστα:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Επιλέξτε τον πάροχό σας"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Επιλέξτε τη συνδρομή σας:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name) επιλεγμένης συνδρομής:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Προειδοποίηση: Αν επιλέξετε λάθος συνδρομή, μπορεί να προκύψουν προβλήματα "
+"με τη χρέωση του λογαριασμού σας ή τη συνδεσιμότητα.\n"
+"\n"
+"Αν δεν είστε σίγουροι για τον τύπο συνδρομής σας, ζητήστε το APN της "
+"συνδρομής σας από τον πάροχο."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Επιλέξτε τη συνδρομή σας"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Η κινητή ευρυζωνική σας σύνδεση περιλαμβάνει τις ακόλουθες ρυθμίσεις:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Η συσκευή σας:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Ο πάροχός σας:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Η συνδρομή σας:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Τώρα θα γίνει σύνδεση στον πάροχο κινητής ευρυζωνικής σύνδεσης, "
+"χρησιμοποιώντας τις ρυθμίσεις που επιλέξατε. Αν η σύνδεση αποτύχει, ή αν δεν "
+"έχετε πρόσβαση στους πόρους του δικτύου, ελέγξτε ξανά τις ρυθμίσεις σας. Για "
+"να τροποποιήσετε τις ρυθμίσεις της κινητής ευρυζωνικής σύνδεσης, επιλέξτε "
+"\"Συνδέσεις δικτύου\" από το μενού Σύστημα >> Προτιμήσεις."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(κανένα)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Πιστοποιητικό C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Άγνωστο"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Επιλέξτε αρχείο"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Επιλέξτε αρχείο"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Επιλέξτε πιστοποιητικό CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Πιστοποιητικό _χρήστη:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Σφάλμα επεξεργασίας σύνδεσης"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Ξεκλείδωμα"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Αποθήκευση του κωδικού πρόσβασης μόνο για αυτόν τον _χρήστη"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Αποθήκευση του κωδικού πρόσβασης για ό_λους τους χρήστες"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Ε_ρώτηση για κωδικό πρόσβασης κάθε φορά"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Απαιτείται κωδικός πρόσβασης για σύνδεση στο '%s'."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Δευτερεύων κωδικός πρόσβασης:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Εμ_φάνιση κωδικών πρόσβασης"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Δευτερεύων κωδικός πρόσβασης:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Εμ_φάνιση κωδικών πρόσβασης"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Δευτερεύων κωδικός πρόσβασης:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "Κωδικός _πρόσβασης:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Αποσύνδεση"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Κανένα"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Δυναμικό WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Δ_ημιουργία"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4245,35 +4620,35 @@ msgstr ""
 "Απαιτούνται κωδικοί πρόσβασης ή κλειδιά κρυπτογράφησης για πρόσβαση στο "
 "δίκτυο Wi-Fi '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Απαιτείται πιστοποίηση δικτύου Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Απαιτείται πιστοποίηση από το δίκτυο Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Δημιουργία νέου δικτύου Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Νέο δίκτυο Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Εισάγετε το όνομα του δικτύου Wi-Fi που επιθυμείτε να δημιουργήσετε."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Κρυφό δίκτυο Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4281,35 +4656,55 @@ msgstr ""
 "Εισάγετε το όνομα και τις ρυθμίσεις ασφαλείας του κρυφού δικτύου Wi-Fi στο "
 "οποίο επιθυμείτε να συνδεθείτε."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Σύν_δεση:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Προσαρμογέας Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Δε βρήκα τον πάροχό μου και θέλω να τον πληκτρολογήσω _χειροκίνητα:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Πάροχος:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Λίστα χωρών ή περιοχών:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Χώρα ή περιοχή"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Ενσύρματη"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Πλέγμα OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4319,17 +4714,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ό_νομα δικτύου:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Σύν_δεση:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Προσαρμογέας Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Χρήση:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4337,7 +4754,7 @@ msgstr ""
 "Αυτό το πρόγραμμα είναι μέρος του NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4345,412 +4762,483 @@ msgstr ""
 "Δεν προορίζεται για χρήση μέσω γραμμής εντολών και εκτελείται στην επιφάνεια "
 "εργασίας του GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "μη ενεργοποιημένο"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "δεν έχει γίνει εγγραφή"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Οικιακό δίκτυο (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Οικιακό δίκτυο"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "γίνεται αναζήτηση"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "άρνηση εγγραφής"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (περιαγωγή %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (περιαγωγή)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Δίκτυο περιαγωγής (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Δίκτυο περιαγωγής"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Κωδικός PIN για την κάρτα SIM '%s' στο '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Απαιτείται κωδικός PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Η κινητή ευρυζωνική συσκευή χρειάζεται τον κωδικό PIN"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Η κινητή ευρυζωνική σύνδεση '%s' είναι ενεργή: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "περιαγωγή"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "σύνδεση %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Πιστοποιητικά DER ή PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Ιδιωτικά κλειδιά DER, PEM ή PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Επιλέξτε ένα αρχείο PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Αρχεία PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Ανώνυμος"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Πιστοποιήθηκε"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Και τα δύο"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Α_νώνυμη ταυτότητα:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Α_ρχείο PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Εσωτερική πιστοποίηση:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Να επιτρέπεται η αυτόματη _παροχή PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Επιλέξτε ένα πιστοποιητικό της αρχής έκδοσης πιστοποιητικών..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Έκδοση 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Έκδοση 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Πιστοποιητικό C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Έκ_δοση PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Συνθηματική φράση WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Εμφάνιση συνθηματικής φράσης"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Ταυτότητα:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "ΓΡΗΓΟΡΑ"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Διοχετευμένο TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Προστατευμένο EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Πιστοποίηση:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (προεπιλογή)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ανοικτό σύστημα"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Κοινόχρηστο κλειδί"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (προεπιλογή)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "Κ_λειδί:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Εμ_φάνιση κλειδιού"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Δείκτης _WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Τύπος:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (προεπιλογή)"
+
+#~ msgid "Ignored"
+#~ msgstr "Αγνόηση"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Απέτυχε η ενημέρωση των μυστικών της σύνδεσης εξαιτίας άγνωστου σφάλματος."
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Αυτόματη σύνδεση σε αυτό το δίκτυο όταν είναι διαθέσιμο"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Π_ληροφορίες σύνδεσης"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Αδύνατη η εισαγωγή της σύνδεσης VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η ανάγνωση του αρχείου '%s', ή το αρχείο δε διαθέτει "
+#~ "αναγνωρίσιμες πληροφορίες σύνδεσης VPN\n"
+#~ "\n"
+#~ "Σφάλμα: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Άγνωστο σφάλμα"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Ενεργές συνδέσεις δικτύου"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Επιλέξτε ένα πιστοποιητικό της αρχής έκδοσης πιστοποιητικών..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Πιστοποιητικό C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Εφαρμογή NetworkManager"
@@ -4784,30 +5272,6 @@ msgstr "_Τύπος:"
 #~ 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"
 
@@ -5045,12 +5509,6 @@ msgstr "_Τύπος:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Μόνο αυτόματες διευθύνσεις (PPP)"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Σύνδεση WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5074,9 +5532,6 @@ msgstr "_Τύπος:"
 #~ msgid "Error: %s"
 #~ msgstr "Σφάλμα: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Αδυναμία δημιουργίας σύνδεσης DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Το τηλέφωνο σας είναι έτοιμο για χρήση!"
 
@@ -5117,15 +5572,6 @@ msgstr "_Τύπος:"
 #~ msgid "%s Network"
 #~ msgstr "Δίκτυο %s"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "Πρωτεύον DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Δευτερεύον DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Τριτεύον DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "Απ_οθήκευση..."
 
@@ -5147,12 +5593,6 @@ msgstr "_Τύπος:"
 #~ "καταλήξει σε επισφαλή και ευάλωτα ασύρματα δίκτυα. Θέλετε να επιλέξετε "
 #~ "ένα πιστοποιητικό αρχής πιστοποίησης;"
 
-#~ msgid "No"
-#~ msgstr "Όχι"
-
-#~ msgid "Yes"
-#~ msgstr "Ναι"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Ασύρματα δίκτυα (%s)"
 
@@ -5191,12 +5631,6 @@ msgstr "_Τύπος:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Ασύρματη σύνδεση %d"
 
-#~ msgid "_Import"
-#~ msgstr "Εισα_γωγή"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Α_υτόματη σύνδεση"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Διαθέσιμη σε όλους τους χρήστες"
 
@@ -5246,17 +5680,6 @@ msgstr "_Τύπος:"
 #~ msgid "PUK code is needed for the mobile broadband device"
 #~ msgstr "Η κινητή ευρυζωνική συσκευή χρειάζεται τον κωδικό PUK"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Ελληνική μεταφραστική ομάδα GNOME\n"
-#~ "  Νίκος Χαρωνιτάκης <charosn@her.forthnet.gr>\n"
-#~ "  Κώστας Παπαδήμας <pkst@gnome.org>\n"
-#~ "  Δημήτρης Γλέζος <dimitris@glezos.com>\n"
-#~ "  Σίμος Ξενιτέλλης <simos@gnome.org>\n"
-#~ "  Τζένη Πετούμενου <epetoumenou@gmail.com>\n"
-#~ "\n"
-#~ "Για περισσότερα δείτε http://www.gnome.gr/"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
@@ -5511,9 +5934,6 @@ msgstr "_Τύπος:"
 #~ msgid "Passphrase:"
 #~ msgstr "Συνθηματικό:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Εμφάνιση συνθηματικής φράσης"
-
 #~ msgid "WEP 40/128-bit Hexadecimal"
 #~ msgstr "WEP 40/128-bit Hexadecimal"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 48e7879b..e743c5c6 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -18,233 +19,253 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "_Wired Network"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "No network connection"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
-msgid "Network Connections"
-msgstr "No network connection"
+msgid "Advanced Network Configuration"
+msgstr "VPN Configuration Error"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 #, fuzzy
 msgid "Manage and change your network connection settings"
 msgstr "Manage Virtual Private Network Connections"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager Applet"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "No network connection"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager Applet"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Authentication:"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "_Network Name:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "No active connections!"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "VPN Connect Failure"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "VPN Connect Failure"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Connection to the wired network failed."
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "_Do not remind me again"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -252,7 +273,7 @@ msgid ""
 "interrupted."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,14 +281,14 @@ msgid ""
 "interrupted."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,14 +298,14 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -293,7 +314,7 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,28 +323,28 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "VPN connection '%s' said:"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -331,20 +352,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "VPN Connect Failure"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -355,7 +376,7 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -364,595 +385,622 @@ msgid ""
 "%s"
 msgstr "VPN connection '%s' said:"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "_Disconnect VPN..."
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Disconnect VPN..."
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 #, fuzzy
 msgid "No network devices available"
 msgstr "No network devices have been found"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configure VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager is not running"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Enable _Wireless"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Edit VPN Connection"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "VPN connection to '%s'"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 #, fuzzy
 msgid "Disconnected"
 msgstr "_Disconnect VPN..."
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr ""
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Wired network connection"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "VPN connection '%s' said:"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Cannot start VPN connection '%s'"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN connection '%s' said:"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Add a new VPN connection"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Wired network connection"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Wired network connection"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "_Wired Network"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "_Wired Network"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Finishing connection to the wired network..."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 #, fuzzy
 msgid "DSL authentication"
 msgstr "Authentication:"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Connect to Other Wireless Network"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Create New Wireless Network"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 #, fuzzy
 msgid "(none)"
 msgstr "none"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Add a new VPN connection"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "_Wired Network"
 msgstr[1] "_Wired Network"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "_Wired Network"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Networking disabled"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Finishing connection to the wireless network '%s'..."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wired network connection"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wired network connection"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wired network connection"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "No active connections!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast Address"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnet Mask"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Primary DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Secondary DNS:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, fuzzy, c-format
 msgid "Ethernet (%s)"
 msgstr "Wired Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr ""
 
-#: ../src/applet-dialogs.c:600
+#: src/applet-dialogs.c:616
 #, fuzzy
-msgid "Security:"
+msgid "Security"
 msgstr "_Wireless Security:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Default Route"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Password:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "Type:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "User Name:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "VPN Connections"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "No active connections!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Adam Weinberger <adamw@gnome.org>"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -961,33 +1009,33 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -995,25 +1043,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1021,90 +1069,97 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Connection Information"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "No active connections!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Create VPN Connection"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1112,651 +1167,797 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Broadcast Address:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "No network connection"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Primary DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
-msgstr ""
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
+msgstr "Primary DNS:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "No active connections!"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Enable _Networking"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 #, fuzzy
 msgid "automatic"
 msgstr "WPA Automatic"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "IP Address:"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "IP Address:"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Could not start the VPN connection '%s' due to a connection error."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
-msgid "_Username:"
+msgid "_Username"
 msgstr "User Name:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 #, fuzzy
 msgid "Sho_w password"
 msgstr "Password:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
-msgid "_Password:"
+msgid "_Password"
 msgstr "Password:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interface"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "WPA Automatic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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 ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
+msgstr "IP Address:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Default Route:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Broadcast Address:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+msgid "_Wake on LAN password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+msgid "_Speed"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "None"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Error connecting to wireless network"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Connection _Information"
+msgid "_Metered connection"
+msgstr "No active connections!"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1764,1130 +1965,1235 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "IP Address:"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "C_onnect"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+msgid "_Method"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "_Network Name:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "Authentication:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
-msgstr ""
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
+msgstr "Authentication:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "None"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+msgid "Method"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "_Wired Network"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:332
+msgid "_LACP port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "VPN Configuration Error"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "VPN Configuration Error"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "No active connections!"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "TKIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
+msgstr "IP Address:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "_Wireless Security:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "Authentication:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Cannot import VPN connection"
-
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "Add a new VPN connection"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 #, fuzzy
 msgid "Connection delete failed"
 msgstr "Connection to the wired network failed."
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN Connections"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 #, fuzzy
 msgid "Address"
 msgstr "IP Address:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 #, fuzzy
 msgid "Editing un-named connection"
 msgstr "Edit VPN Connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Error displaying connection information:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Connection to the wired network failed."
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -2896,259 +3202,302 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Create VPN Connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "No network connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 #, fuzzy
 msgid "Connection add failed"
 msgstr "Connection Information"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
-msgid "Connection _name:"
+msgid "Connection _name"
 msgstr "Connection _Information"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_xport"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Connection to the wired network failed."
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "VPN connection '%s' said:"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "VPN connection '%s' said:"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "Edit the selected VPN connection"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Delete the selected VPN connection"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Delete the selected VPN connection"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Delete the selected VPN connection"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "No network connection"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Create VPN Connection"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Error retrieving VPN connection '%s'"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Connection to the wired network failed."
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Create VPN Connection"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+#, fuzzy
+msgid "Network Connections"
+msgstr "No network connection"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN Connections"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "_Login to Network"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "_Wired Network"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Primary DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "No network connection"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Wired network connection"
@@ -3156,85 +3505,89 @@ msgstr "Wired network connection"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interface:"
+
+#: src/connection-editor/page-dsl.c:365
 #, fuzzy, c-format
 msgid "DSL connection %d"
 msgstr "VPN connection '%s' said:"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Delete VPN connection \"%s\"?"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 #, fuzzy
 msgid "Default"
 msgstr "Default Route:"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3242,273 +3595,270 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Cannot add VPN connection"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 #, fuzzy
 msgid "Automatic (VPN)"
 msgstr "Automatic (Default)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 #, fuzzy
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (Default)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 #, fuzzy
 msgid "Automatic (DHCP)"
 msgstr "Automatic (Default)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 #, fuzzy
 msgid "Automatic, DHCP only"
 msgstr "Automatic (Default)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "VPN connection '%s' said:"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr ""
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr ""
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "none"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "VPN connection '%s' said:"
@@ -3516,181 +3866,179 @@ msgstr "VPN connection '%s' said:"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "No network connection"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN connection to '%s'"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "VPN Connect Failure"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "VPN connection to '%s'"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Create VPN Connection"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "VPN connection '%s' said:"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP Passphrase"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "_Wireless Security:"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3698,427 +4046,389 @@ msgid ""
 "Error: %s."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Edit VPN Connection"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "Wired network connection"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Password:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
-#, c-format
-msgid "%s _certificate:"
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Password:"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "none"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Password:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr ""
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Tertiary Password:"
+msgstr "Password:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
 msgid "_Secondary Password:"
 msgstr "Secondary DNS:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 #, fuzzy
-msgid "_Tertiary Password:"
+msgid "_Password:"
 msgstr "Password:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Wired network connection"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wireless Network Key Required"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Create New Wireless Network"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Enter the name of the wireless network to which you wish to connect."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connect to Other Wireless Network"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4127,38 +4437,54 @@ msgstr ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Wireless Security:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "C_onnect"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Wireless _adapter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4168,435 +4494,465 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Wireless Security:"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Network Name:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "C_onnect"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Wireless _adapter:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "_Wired Network"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "_Login to Network"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "VPN Connections"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Authentication:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Authentication:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "No CA certificate is _required"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP Passphrase"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Passphrase:"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-tls.ui:20
+msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "Authentication:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr "Automatic (Default)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr "Automatic (Default)"
+
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
-msgid "_Key:"
+msgid "_Key"
 msgstr "Key:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
-msgid "_Type:"
+msgid "_Type"
 msgstr "Type:"
 
 #, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Could not start the VPN connection '%s' due to a connection error."
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Connection _Information"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Cannot import VPN connection"
+
+#, fuzzy
+#~ msgid "Active Network Connections"
+#~ msgstr "Wired network connection"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager Applet"
 
@@ -4643,9 +4999,6 @@ msgstr "Type:"
 #~ msgid "Copyright © 2004-2005 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#~ msgid "translator-credits"
-#~ msgstr "Adam Weinberger <adamw@gnome.org>"
-
 #~ msgid "VPN Error"
 #~ msgstr "VPN Error"
 
@@ -4841,9 +5194,6 @@ msgstr "Type:"
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Other Wireless Network..."
 
-#~ msgid "Passphrase:"
-#~ msgstr "Passphrase:"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "_Always Trust this Wireless Network"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 0007cf6d..8adccb5c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-03-26 18:11+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -18,48 +19,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Network"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Manage your network connections"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "_Manual configuration"
 
 #
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Manage and change your network connection settings"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Disable connected notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Set this to true to disable notifications when connecting to a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Disable disconnected notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Set this to true to disable notifications when disconnecting from a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Disable VPN notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -67,48 +77,49 @@ msgstr ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Suppress networks available notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stamp"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Used to determine whether settings should be migrated to a new version."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Disable Wi-Fi Create"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Set to true to disable creation of adhoc networks when using the applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignore CA certificate"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -116,7 +127,7 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -124,130 +135,143 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Network Manager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "No network connection"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "- NetworkManager VPN properties"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X authentication"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Network name:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Failed to add/activate connection"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Connection failure"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Device disconnect failed"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Disconnect failure"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Connection activation failed"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Don't show this message again"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -258,7 +282,7 @@ msgstr ""
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -289,7 +313,7 @@ msgstr ""
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -316,7 +340,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -354,19 +378,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN connection has been successfully established.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN Connection Failed"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -379,7 +403,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -392,570 +416,595 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "device not ready (firmware missing)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "device not ready"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "disconnected"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "device not managed"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "No network devices available"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configure VPN…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Add a new VPN connection"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager is not running…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Enable _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Enable _Mobile Broadband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Enable N_otifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Edit Connections…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_About"
 
 #
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "You are now connected to '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "The network connection has been disconnected."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparing network connection '%s'…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "User authentication required for network connection '%s'…"
 
 #
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Requesting a network address for '%s'…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Network connection '%s' active"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Starting VPN connection '%s'…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "User authentication required for VPN connection '%s'…"
 
 #
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Requesting a VPN address for '%s'…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN connection '%s' active"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Wrong PUK code; please contact your provider."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Wrong PIN code; please contact your provider."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Sending unlock code…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobile Broadband (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobile Broadband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Available"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "New Mobile Broadband Connection"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Connection Established"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "You are now connected to the Mobile Broadband network."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobile Broadband network."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "You are now registered on the home network."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "You are now registered on a roaming network."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "You are now connected to the mobile broadband network."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Preparing mobile broadband connection '%s'…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configuring mobile broadband connection '%s'…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "User authentication required for mobile broadband connection '%s'…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobile broadband connection '%s' active"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet Networks (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet Network (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet Networks"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet Network"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "You are now connected to the ethernet network."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Preparing ethernet network connection '%s'…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configuring ethernet network connection '%s'…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "User authentication required for ethernet network connection '%s'…"
 
 #
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Requesting an ethernet network address for '%s'…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet network connection '%s' active"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL authentication"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Connect to Hidden Wi-Fi Network"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Create New Wi-Fi Network"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(none)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Failed to add new connection"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi Networks (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi Network (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi Network"
 msgstr[1] "Wi-Fi Networks"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi is disabled"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi is disabled by hardware switch"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "More networks"
 
 #
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi Networks Available"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Use the network menu to connect to a Wi-Fi network"
 
 #
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "You are now connected to the Wi-Fi network '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparing Wi-Fi network connection '%s'…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configuring Wi-Fi network connection '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "User authentication required for Wi-Fi network '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Requesting a Wi-Fi network address for '%s'…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi network connection '%s' active: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi network connection '%s' active"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Failed to activate connection"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Addresses"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (default)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast Address"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnet Mask"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Primary DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Secondary DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Ternary DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Speed"
 
 #
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Security:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Default Route"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Password:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN Type"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN Gateway"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN Username"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN Banner"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Base Connection"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "No valid active connections found!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -963,17 +1012,21 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager Website"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "David Lodge <dave@cirt.net>James Ogley <james@usr-local-bin.org>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -981,33 +1034,33 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Missing resources"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobile broadband network password"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "A password is required to connect to '%s'."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN unlock required"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN Unlock Required"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1017,25 +1070,25 @@ msgstr ""
 "used."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Show PIN code"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK unlock required"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK Unlock Required"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1045,35 +1098,42 @@ msgstr ""
 "used."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "New PIN code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Re-enter new PIN code:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Show PIN/PUK codes"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Connection Information"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Failed to create DUN connection: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1082,41 +1142,41 @@ msgstr ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nore automatically obtained routes"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Use this connection only for resources on its network"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1124,16 +1184,16 @@ msgstr ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Create…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Choose a Connection Type"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1145,85 +1205,100 @@ msgstr ""
 "If you are creating a VPN, and the VPN connection you wish to create does "
 "not appear in the list, you may not have the correct VPN plugin installed."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Service:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Active backup"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptive transmit load balancing"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptive load balancing"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recommended)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Bonded _connections:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_ode:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Monitoring _frequency:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Interface name:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Link Monitoring:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1231,125 +1306,185 @@ msgstr ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Link _up delay:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Link _down delay:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Primary DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Path _cost:"
 
 #
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hairpin mode:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Bridged _connections:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Forward delay:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Hello time:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Enable _Networking"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Enable _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Max age:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Ageing time:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatic"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "default"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Enable _Wi-Fi"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1360,445 +1495,541 @@ msgstr ""
 "network device this connection is activated on.  This feature is known as "
 "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Address"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Address"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN interface _name:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Any device"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Failed to update connection secrets due to an unknown error."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Use 802.1_X security for this connection"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "Enable _Wi-Fi"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_Priority:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_Priority:"
 
 #
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Username:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Service:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Sho_w password"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Password:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interface"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Parent interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Parent interface:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Service:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "C_loned MAC address:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Private key password:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Default"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignore"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Private key password:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Speed:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Automatically connect to _VPN when using this connection"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "None"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "All _users may connect to this network"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Automatically connect to _VPN when using this connection"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Connection _Information"
+msgid "Firewall _zone"
+msgstr "Firewall _zone:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Bonded _connections:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Connect _automatically"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "Firewall _zone:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1807,7 +2038,7 @@ msgstr ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1815,128 +2046,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatic, addresses only"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Addresses"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Transport mode:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Transport mode:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Device name + number"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Mode:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatic with manual DNS settings"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Shared to other computers"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Method:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1947,8 +2182,8 @@ msgstr ""
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
 "enter it here."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1956,25 +2191,26 @@ msgstr ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP client ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "S_earch domains:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS ser_vers:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1982,11 +2218,11 @@ msgstr ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Require IPv_4 addressing for this connection to complete"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1994,25 +2230,35 @@ msgstr ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Enable _Wi-Fi"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2022,15 +2268,19 @@ msgstr ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Require IPv_6 addressing for this connection to complete"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2038,543 +2288,643 @@ msgstr ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metric"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Import"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mber:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "N_etwork ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Change…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Allow _roaming if home network is not available"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Sho_w passwords"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Allowed methods:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configure _Methods…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Use point-to-point encryption (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Require 128-bit encryption"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Use _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Allow _BSD data compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Allow _Deflate data compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Use TCP _header compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Send PPP _echo packets"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Method:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "None"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Import a saved VPN configuration…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Method:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Advanced"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet Networks"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
+msgstr ""
+
 #
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
-msgid "_Port priority:"
+msgid "_Port priority"
 msgstr "_Priority:"
 
-#: ../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
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Private _key:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Link _up delay:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Link _down delay:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Parent interface:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Import a saved VPN configuration…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_Manual configuration"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "_Manual configuration"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Bonded _connections:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Hardware Address:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2582,219 +2932,225 @@ msgid ""
 msgstr ""
 
 #
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Priority:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Parent interface:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN interface _name:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Cloned MAC address:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Device name + number"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
 #
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "S_ecurity:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "C_hannel:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Allowed Authentication Methods"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2803,111 +3159,99 @@ msgstr ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Cannot import VPN connection"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"The file '%s' could not be read or does not contain recognised VPN "
-"connection information\n"
+"The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
-"Error: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Unknown error"
+"Error: no VPN service type."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Select file to import"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Import a saved VPN configuration…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2915,79 +3259,86 @@ msgstr ""
 "The connection editor dialogue could not be initialised due to an unknown "
 "error."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Could not create new connection"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Connection delete failed"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Are you sure you wish to delete the connection %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN Connections"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Address"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Editing %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Editing un-named connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Connection _name:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Error initialising editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Connection add failed"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2995,53 +3346,50 @@ msgstr ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Save"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Save any changes made to this connection."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Authenticate to save this connection for all users of this machine."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Could not create connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Could not edit connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Unknown error creating connection editor dialogue."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Error initialising editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Connection add failed"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3050,202 +3398,248 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Connection _name:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Export…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "label"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "label"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "never"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "now"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day ago"
 msgstr[1] "%d days ago"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d month ago"
 msgstr[1] "%d months ago"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d year ago"
 msgstr[1] "%d years ago"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Connection add failed"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL connection %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL connection %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Last Used"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Authenticate to edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Authenticate to delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Unsupported mobile broadband connection type."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Don't know how to create '%s' connections"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Error editing connection"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Connection add failed"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Don't know how to create '%s' connections"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Error editing connection"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Did not find a connection with UUID '%s'"
 
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Network Connections"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Add a new VPN connection"
+
 #
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X Security"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Could not load 802.1X Security user interface."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Use 802.1_X security for this connection"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Could not load ethernet user interface."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "could not find the Bluetooth device."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bond connection %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet Network"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi Network"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Could not load bond user interface."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Primary DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond connection %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Could not load bridge user interface."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Bridge connection %d"
@@ -3253,33 +3647,38 @@ msgstr "Bridge connection %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Bridge Port"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Could not load bridge port user interface."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Could not load DSL user interface."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Could not load DSL user interface."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Parent interface:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL connection %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3289,44 +3688,43 @@ msgstr ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignored"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Could not load ethernet user interface."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "C_loned MAC address:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet connection %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Default"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3336,11 +3734,11 @@ msgstr ""
 "zone, selecting it results in the use of the default zone set in the "
 "firewall. Only usable if firewalld is active."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Could not load General user interface."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3351,183 +3749,187 @@ msgstr ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Could not load InfiniBand user interface."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand connection %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Could not load IPv4 user interface."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ethernet connection %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatic (VPN) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatic, addresses only"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatic (PPPoE) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Link-Local Only"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Additional DNS ser_vers:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Additional s_earch domains:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editing IPv4 routes for %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 Settings"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Could not load IPv4 user interface."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editing IPv6 routes for %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 Settings"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Could not load IPv6 user interface."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Could not load WiMAX user interface."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX connection %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Could not load mobile broadband user interface."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Unsupported mobile broadband connection type."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Select Mobile Broadband Provider Type"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3536,90 +3938,86 @@ msgstr ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "none"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editing PPP authentication methods for %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP Settings"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Could not load PPP user interface."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Could not load bond user interface."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Could not load vlan user interface."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL connection %d"
@@ -3627,12 +4025,12 @@ msgstr "DSL connection %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "Bridge Port"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Could not load bridge port user interface."
@@ -3640,58 +4038,58 @@ msgstr "Could not load bridge port user interface."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "No network connection"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Could not load vlan user interface."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN connection %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Could not load VPN user interface."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Could not find VPN plugin service for '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Could not find VPN plugin service for '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Connection failure"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Could not load VPN user interface."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Could not find VPN plugin service for '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN connection %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Choose a VPN Connection Type"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3702,7 +4100,7 @@ msgstr ""
 "of VPN connection you wish to create does not appear in the list, you may "
 "not have the correct VPN plugin installed."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3711,7 +4109,7 @@ msgstr ""
 "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"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3721,95 +4119,93 @@ msgstr ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Could not load Wi-Fi user interface."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Any device"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi connection %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex or ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 
 #
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi Security"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Could not load Wi-Fi security user interface."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "A file named \"%s\" already exists."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Do you want to replace %s with the VPN connection you are saving?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Cannot export VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3820,222 +4216,106 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Export VPN connection…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Unlock"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automatically unlock this device"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Active Network Connections"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ignore CA certificate"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Choose CA Certificate"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Private _key:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Private key password:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Choose CA Certificate"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_User certificate:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Your mobile broadband connection is configured with the following settings:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Your Device:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Your Provider:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Your Plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"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."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "My country is not listed"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Select your plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Selected plan _APN (Access Point Name):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"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."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Choose your Billing Plan"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "My plan is not listed…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Select your provider from a _list:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "I can't find my provider and I wish to enter it _manually:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Provider:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Choose your Provider"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Country or Region List:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Country or region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "My country is not listed"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Choose your Provider's Country or Region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Any device"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "New Mobile Broadband Connection"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4043,230 +4323,309 @@ msgstr ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "mobile (3G) network."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "You will need the following information:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Your broadband provider's name"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Your broadband billing plan name"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(in some cases) Your broadband billing plan APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Create a connection for _this mobile broadband device:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Any device"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set up a Mobile Broadband Connection"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Country or region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Choose your Provider's Country or Region"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Select your provider from a _list:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "I can't find my provider and I wish to enter it _manually:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "My provider uses CDMA technology (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Choose your Provider"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Select your plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Selected plan _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"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."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Choose your Billing Plan"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Your mobile broadband connection is configured with the following settings:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Your Device:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Your Provider:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Your Plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"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."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirm Mobile Broadband Settings"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(none)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A certificate:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Unknown"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Select A File"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Select A File"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Choose CA Certificate"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_User certificate:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Error editing connection"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Unlock"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "As_k for this password every time"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "A password is required to connect to '%s'."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Password:"
+msgid "Sh_ow passwords"
+msgstr "Sho_w passwords"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Password:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "Sho_w passwords"
+msgid "_Secondary Password:"
+msgstr "_Password:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Disconnect"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "None"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 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
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_reate"
 
 #
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi Network Authentication Required"
 
 #
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentication required by Wi-Fi network"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Create New Wi-Fi Network"
 
 #
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "New Wi-Fi network"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Enter a name for the Wi-Fi network you wish to create."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connect to Hidden Wi-Fi Network"
 
 #
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Hidden Wi-Fi network"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4275,36 +4634,56 @@ msgstr ""
 "connect to."
 
 #
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi _security:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nnection:"
 
 #
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi _adapter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "I can't find my provider and I wish to enter it _manually:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Provider:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Country or Region List:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Country or region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Wired"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4314,17 +4693,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _security:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Network name:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnection:"
+
+#
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _adapter:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Usage:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4332,7 +4735,7 @@ msgstr ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4340,414 +4743,474 @@ msgstr ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "not enabled"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "not registered"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Home network (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Home network"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "searching"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registration denied"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming network (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Roaming network"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN code for SIM card '%s' on '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN code required"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN code is needed for the mobile broadband device"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobile broadband connection '%s' active: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s connection"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ignore CA certificate"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Choose a PAC file…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "All files"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Authenticated"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Both"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anony_mous identity:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _file:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Inner authentication:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Choose a Certificate Authority certificate…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A certificate:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ignore CA certificate"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _version:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit Passphrase"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Show passphrase"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ignore CA certificate"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ignore CA certificate"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentity:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Au_thentication:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Default)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Default)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Key:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Sho_w key"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Type:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (default)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignored"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Failed to update connection secrets due to an unknown error."
+
+#
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Priority:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Automatically connect to this network when it is available"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Connection _Information"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Cannot import VPN connection"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "The file '%s' could not be read or does not contain recognised VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Unknown error"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Active Network Connections"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Choose a Certificate Authority certificate…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A certificate:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Network Manager"
@@ -4781,15 +5244,6 @@ msgstr "_Type:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegotiate"
 
@@ -4884,12 +5338,6 @@ msgstr "_Type:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Secondary DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Ternary DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_Device MAC address:"
 
@@ -4941,12 +5389,6 @@ msgstr "_Type:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Automatic (PPP) addresses only"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Could not load WiMAX user interface."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX connection %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4970,9 +5412,6 @@ msgstr "_Type:"
 #~ msgid "Error: %s"
 #~ msgstr "Error: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Failed to create DUN connection: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Your phone is now ready to use!"
 
@@ -5065,12 +5504,6 @@ msgstr "_Type:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Wireless connection %d"
 
-#~ msgid "_Import"
-#~ msgstr "_Import"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Connect _automatically"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "A_vailable to all users"
 
@@ -5169,9 +5602,6 @@ msgstr "_Type:"
 #~ msgid "Could not find some required resources (the glade file)!"
 #~ msgstr "Could not find some required resources (the glade file)!"
 
-#~ msgid "translator-credits"
-#~ msgstr "David Lodge <dave@cirt.net>James Ogley <james@usr-local-bin.org>"
-
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
@@ -5194,9 +5624,6 @@ msgstr "_Type:"
 #~ msgid "Passphrase:"
 #~ msgstr "Passphrase:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Show passphrase"
-
 #~ msgid "alert text"
 #~ msgstr "alert text"
 
diff --git a/po/eo.po b/po/eo.po
index 750963f4..210eb103 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-12-26 18:24+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-01-06 01:51+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
@@ -25,47 +25,56 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Reto"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Kontroli viajn retkonektojn"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Retkonektoj"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktivaj retkonektoj"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Administri kaj ŝanĝi viajn retkonektajn agordojn"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Elŝalti atentigojn pri konektoj"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al reto."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Elŝalti atentigojn pri malkonektoj"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam malkonektanta al reto."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Elŝalti VPN-atentigojn"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -73,196 +82,197 @@ msgstr ""
 "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektante aŭ "
 "malkonektante de VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Nuligi atentigon pri disponeblaj retoj"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam sendrataj retoj "
 "disponeblas."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stampo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Uzita por determini ĉu agordoj devus esti migrigita al nova versio."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Elŝalti kreon de sendrataj konektoj"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Agordi tion ĉi \"vera\", se vi volas elŝalti la kreadon de por-okazaj retoj "
 "per la aplikaĵeto."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignori CA-atestilon"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Reta mastrumilo"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Neniu retkonekto"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Apleto por NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-aŭtentigo"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.c:209
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "K_onekti"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Ret_nomo:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "provizore"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Malsukcesis aldoni/aktivigi konekton"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Konekto malsukcesis"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Malkonekto malsukcesis"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Konekto-aktivigo malsukcesis"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ne remontri tiun mesaĝon"
 
-#: ../src/applet.c:899
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -272,7 +282,7 @@ msgstr ""
 "\n"
 "Malkonektiĝis VPN-konekto “%s” ĉar retkonekto estis interrompita."
 
-#: ../src/applet.c:901
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +292,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar retkonekto estis interrompita."
 
-#: ../src/applet.c:903
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -291,7 +301,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar VPN-servo haltigis neatendite."
 
-#: ../src/applet.c:905
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -301,7 +311,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar VPN-servo revenigis nevalidan agordon."
 
-#: ../src/applet.c:907
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -310,7 +320,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar la konekta provo eltempiĝis."
 
-#: ../src/applet.c:909
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -319,7 +329,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar la VPN-servo ne komencis tempe."
 
-#: ../src/applet.c:911
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -328,7 +338,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar la VPN-servo malsukcesis je la komenco."
 
-#: ../src/applet.c:913
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -337,7 +347,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar ne estis validaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:915
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -346,7 +356,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto “%s” ĉar estis nevalidaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:920
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -355,7 +365,7 @@ msgstr ""
 "\n"
 "La VPN-konekto “%s” malsukcesis."
 
-#: ../src/applet.c:947
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -363,19 +373,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:949
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:951
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN-ensalutmesaĝo"
 
-#: ../src/applet.c:959 ../src/applet.c:999
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Malsukcesis VPN-konekto"
 
-#: ../src/applet.c:1003
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -388,7 +398,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -401,571 +411,583 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "aparato ne pretas (mikroprogramaro mankas)"
 
-#: ../src/applet.c:1297
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "aparato ne pretas"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nekonektite"
 
-#: ../src/applet.c:1323
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Malkonekti"
 
-#: ../src/applet.c:1337
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "aparato ne administrita"
 
-#: ../src/applet.c:1410
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Neniuj retaparatoj disponeblaj"
 
-#: ../src/applet.c:1464
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-konektoj"
 
-#: ../src/applet.c:1508
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Agordi na VPN…"
 
-#: ../src/applet.c:1511
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Aldoni VPN-konekton…"
 
-#: ../src/applet.c:1617
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager ne estas rulanta…"
 
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Retkonektado elŝaltitas"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Enŝalti _reton"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Enŝalti _sendratan reton"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Enŝalti _moveblan larĝkapacitan konekton"
 
 #. Toggle notifications item
-#: ../src/applet.c:1862
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Enŝalti atentig_ojn"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1874
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Konektaj _informoj"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Redakti konektojn…"
 
-#: ../src/applet.c:1896
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Pri"
 
-#: ../src/applet.c:2207
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Nun vi estas konektita al “%s”."
 
-#: ../src/applet.c:2247
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Malkonektita"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "La retkonekto estas malkonektigita."
 
-#: ../src/applet.c:2550
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparante retkonekton “%s”…"
 
-#: ../src/applet.c:2553
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Retkonekto “%s” necesas uzantan aŭtentigon…"
 
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Petanta retan adreson por “%s”…"
 
-#: ../src/applet.c:2559
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Retkonekto “%s” estas aktiva"
 
-#: ../src/applet.c:2632
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Komencanta VPN-konekton “%s”…"
 
-#: ../src/applet.c:2635
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN-retkonekto “%s” necesas uzantan aŭtentigon…"
 
-#: ../src/applet.c:2638
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Petanta VPN-adreson por “%s”…"
 
-#: ../src/applet.c:2641
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-konekto estas aktiva"
 
-#: ../src/applet.c:2691
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Neniu retkonekto"
 
-#: ../src/applet.c:3292
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Apleto por NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Malĝusta PUK-kodo; bonvolu kontakti vian retprovizanton."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Malĝusta PIN-kodo; bonvolu kontakti vian retprovizanton."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Sendas malŝlosan kodon…"
 
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Poŝtelefona larĝkapacita reto (%s)"
 
-#: ../src/applet-device-broadband.c:739
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Poŝtelefona larĝkapacita reto"
 
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponeble"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:805
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Nova poŝtelefona larĝkapacita konekto…"
 
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Konekto estas starigita"
 
-#: ../src/applet-device-broadband.c:820
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Vi estas nun konektita al la poŝtelefona larĝkapacita reto."
 
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Movebla larĝkapacita reto."
 
-#: ../src/applet-device-broadband.c:961
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Vi estas nun registrita en la hejma reto."
 
-#: ../src/applet-device-broadband.c:967
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Vi estas nun registrita en la retmigra reto."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Vi estas nun konektita al la poŝtelefona larĝkapacita reto."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Pretigas poŝtelefonan larĝkapacitan konekton “%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Agordas poŝtelefonan larĝkapacitan konekton “%s”…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Movebla larĝkapacita konekto “%s” necesas aŭtentigon de uzanto…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Poŝtelefona larĝkapacita konekto “%s” aktivas"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Aŭtomata eterreto"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Drataj retoj (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Drata reto (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Drataj retoj"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Drata reto"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Vi estas nun konektite al la drata reto."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Preparanta drat-retan konekton “%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Agordanta drat-retan konekton “%s”…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Drat-reta konekto “%s” bezonas aŭtentigon de la uzanto…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Petanta drat-retan adreson por “%s”…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Drat-reta konekto “%s” aktiva"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-aŭtentigo"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Konekti al kaŝita sendrata reto…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Krei _novan sendratan reton…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Malsukcesis aldoni novan konekton"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Sendrataj retoj (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Sendrata reto (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Sendrata reto"
 msgstr[1] "Sendrataj retoj"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Sendrata reto estas elŝaltite"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Pliaj retoj"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Sendrataj retoj estas disponeblaj"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Uzi la retmenuon por konekti al sendrata reto"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Vi estas nun konektite al la sendrata reto “%s”."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Agordanta retkonekton “%s”…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Agordanta drat-retan konekton “%s”…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Sendrata reto “%s” necesas legitimadon de la uzanto…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Petanta retan adreson por “%s”…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Sendrat-reta konekto “%s” aktiva: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Drat-reta konekto “%s” aktiva"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Malsukcesis aktivigi konekton"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Eraro montrante konekt-informojn:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamika WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresoj"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (defaŭlte)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nekonate"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adreso"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Elsenda adreso"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subreta masko"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Unuaranga DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Duaranga DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Triaranga DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eterreto (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Sendrata reto laŭ 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Ĝenerale"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfaco"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Aparatara adreso"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Pelilo"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Rapido"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sekureco:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Defaŭlta kurso"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorite"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Pasvorto:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-Tipo"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-kluzo"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-uzantonomo"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-rubando"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Baza konekto"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nekonata"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Ne validaj aktivaj konektoj trovitaj!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -975,23 +997,23 @@ msgstr ""
 "Kopirajto © 2005-2008 Novell, Inc.\n"
 "kaj multaj aliaj komunumaj kontribuantoj kaj tradukantoj"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Apleto en atentiga zono por administri viajn retajn aparatojn kaj konektojn."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Retpaĝaro de NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "M., kitzOgen, # Michael MORONI, Patrick OUDEJANS, Aisano, Neil SHEPPERD, "
 "Tiffany ANTOPOLSKI, Kristjan SCHMIDT"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -999,33 +1021,33 @@ msgstr ""
 "La Retadministrilo-apleto ne povis trovi kelkajn neprajn risurcojn (la .ui-"
 "dosiero ne estis trovita)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Mankantaj risurcoj"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Pasvorto de la movebla larĝkapacita konekto"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Pasvorto bezonatas por konektiĝi al “%s”."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM-PIN postulas malŝloson"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM-PIN postulas malŝloson"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1035,25 +1057,25 @@ msgstr ""
 "povas esti uzata."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kodo:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Montri PIN-kodon"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Malŝloso de SIM-PUK postulata"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Malŝloso de SIM-PUK postulata"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1063,44 +1085,42 @@ msgstr ""
 "povos esti uzata."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kodo:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nova PIN-kodo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Reenigi novan PIN-kodon:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Montri PIN/PUK-kodojn"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 #, fuzzy
-#| msgid "Connection Information"
 msgid "Connection had no VPN setting"
 msgstr "Konektinformoj"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, fuzzy, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Malsukcesis krei DUN-konekton: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1109,41 +1129,41 @@ msgstr ""
 "IP-adresoj identigas vian komputilon surrete. Alklaku la butonon “Aldoni” "
 "por aldoni IP-adreson."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Aldoni"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Forigi"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nori aŭtomate ricevitajn itinerojn"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Uzi ĉi tiun konekton nur por fontoj sur ĝia reto"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1151,15 +1171,15 @@ msgstr ""
 "Se enŝaltite, ĉi tiu konekto neniam estos uzata kiel la defaŭltan "
 "retkonekton."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "K_rei…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Elekti konekttipon"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1172,210 +1192,230 @@ msgstr ""
 "Se la de vi dezirata VPN-speco ne disponeblas en la listo, eble vi ne "
 "instalis la ĝustan VPN-kromprogramon."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Servo:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "_Elsendi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Drataj _konektoj:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "Reĝim_o:"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Interfaco-nomo:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Unuarang:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajtoj"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritato:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Pont_konektoj:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Enŝalti _reton"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1383,40 +1423,40 @@ msgid ""
 "frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "aŭtomata"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "defaŭlte"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1427,456 +1467,528 @@ msgstr ""
 "retaparato al kiu tiu ĉi konekto estas farata. Tiu ĉi trajto estas konata "
 "kiel MAC-klonado aŭ mistifikado. Ekzemple: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC-adreso"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adreso"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nevalida interfaco-nomo (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "nevalida aparatara adreso"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "aparato"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Malsukcesis ĝisdatigi konektosekretojn pro nekonata eraro."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Uzi Data Center Bridging (DCB) por ĉi tiu konekto"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritato"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Agordoj…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+#, fuzzy
+msgid "0"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+#, fuzzy
+msgid "1"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+#, fuzzy
+msgid "5"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+#, fuzzy
+msgid "6"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+#, fuzzy
+msgid "7"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
+msgstr "Prioritato"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Uzantonomo:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servo:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Montri pasvorton"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Pasvorto:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
-msgid "PPP _interface:"
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
 msgstr "PPP-_interfaco:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
-msgid "P_arent interface:"
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
 msgstr "_Gepatra interfaco:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr ""
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Gepatra interfaco:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Aŭtomate"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Tordita Paro (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignori"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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:191
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Permane"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Pordo:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Servo:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "K_lonita MAC-adreso:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Pasvorto por privata ŝlosilo:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "De_faŭlte"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignori"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Elsendi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Pasvorto por privata ŝlosilo:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Rapido:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Plene ambaŭdire_kta:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Neniu"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Ĉiuj _uzantoj rajtas konekti al tiu reto"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Teamigitaj konektoj:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Konektaj _informoj:"
+msgid "Connect _automatically with priority"
+msgstr "Konekti _aŭtomate"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1885,7 +1997,7 @@ msgstr ""
 "IP-adresoj identigas vian komputilon en la reto. Alklaku la butonon “Aldoni” "
 "por aldoni IP-adreson."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1893,129 +2005,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Aŭtomate, nur adresoj"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresoj"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Konektite"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
 msgstr "Aparatnomo:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
 msgstr "Gepatra aparato:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
-#| msgid "M_ode:"
-msgid "Mode:"
-msgstr "Reĝimo:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+#, fuzzy
+msgid "Mode"
+msgstr "Reĝi_mo:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+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-ip-tunnel.ui:245
+#, fuzzy
+msgid "MTU"
+msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Aŭtamata per permanaj DNS-agordoj"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Ligilo-loko"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:211
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Kunhavita kun aliaj komputiloj"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metodo:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -2026,8 +2140,8 @@ msgstr ""
 "konfiguron de via komputilo. Se vi deziras uzi DHCP-klientan identigilon, "
 "enigu ĝin ĉi tie."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2035,25 +2149,26 @@ msgstr ""
 "Retregionoj uzataj dum serĉado de nomoj de gastigaj komputiloj. Uzu komojn "
 "por disigi plurajn retregionojn."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP-klientidentigilo:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "S_erĉi domajnojn:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS-serviloj:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2062,11 +2177,11 @@ msgstr ""
 "gastigaj komputiloj. Uzu komojn por disigi plurajn adresojn de serviloj por "
 "retregionaj nomoj."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Postuli IPv_4-adresadon antaŭ ol ĉi tiu konekto povas esti farata"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2074,34 +2189,34 @@ msgstr ""
 "Permesi la kompletigon de la konekto, se dum konektado al IPv6-kapablaj "
 "retoj la IPv4-agordo malsukcesas sed la IPv6-agordo sukcesas."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "Alidi_rektoj…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Elŝaltite"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2112,19 +2227,19 @@ msgstr ""
 "gastigaj komputiloj. Uzu komojn por disigi plurajn adresojn de serviloj por "
 "retregionaj nomoj."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Postuli IPv_6-adresadon por kompletigi ĉi tiun konekton"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2132,834 +2247,851 @@ msgstr ""
 "Permesi la kompletigon de la konekto, se dum konektado al IPv4-kapablaj "
 "retoj la IPv6-agordo malsukcesas sed la IPv4-agordo sukcesas."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 #, fuzzy
-#| msgid "Metric"
 msgid "Strict"
 msgstr "Metra"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#: src/connection-editor/ce-page-macsec.ui:191
+#, fuzzy
+msgid "Keys"
 msgstr "Ŝlosiloj:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#: src/connection-editor/ce-page-macsec.ui:207
+#, fuzzy
+msgid "Parameters"
 msgstr "Parametroj:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#: src/connection-editor/ce-page-macsec.ui:224
+#, fuzzy
+msgid "Validation"
 msgstr "Kontrolo:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-#| msgid "_Import"
-msgid "SCI port:"
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Ĉifradi"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Baza"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Altnivele"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "R_eta identigilo:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Ŝanĝi…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permesi _retmigradon se la hejma reto ne disponeblas"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Montri pasvortojn"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Aŭtentokontrolo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Permesitaj metodoj:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Agordi _metodojn…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Densigo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Uzi punkt-al-punktan ĉifradon (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Necesas ĉifradon da 128-bajtoj"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Uzi na _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permesi kompaktigon de _BSD-datumoj"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permesi _Deflate-datumkompaktigon"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Apliki densigon de TCP-_kapoj"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eĥo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Sendi _eĥajn PPP-pakaĵojn"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Elporti skripton de dosiero…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
 msgstr "Metodo:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Alt_nivele…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Drataj retoj"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
-msgid "_Port priority:"
+msgid "_Port priority"
 msgstr "_Prioritato:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioritato:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Privata ŝ_losilo:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 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:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+#, fuzzy
+msgid "Send _interval"
 msgstr "Send_intervalo:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "E_nporti teaman agordon de dosiero…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Porda prioritato"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Eterreto"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "_Teamigitaj konektoj:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eterreto"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "_Aparatara adreso:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "_Aparatara adreso:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioritato:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Senda po_vumo:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Senda po_vumo:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Gepatra interfaco:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Interfaco-nomo:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "K_lonita MAC-adreso:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "S_ekureco:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Provizore"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Senda po_vumo:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rapido:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanalo:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ben_do:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Permesitaj aŭtentokontrol-metodoj"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokolo de aŭtentigo de pasvorto"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versio 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2969,122 +3101,99 @@ msgstr ""
 "aŭtentigkontrolo. Se konektoj malsukcesas, provu elŝalti la subtenon por "
 "kelkaj metodoj."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:233
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"La VPN-kromprogramo malsukcesis korekte importi la VPN-konekton\n"
-"\n"
-"Eraro: neniu speco de VPN-servo."
-
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Ne eblas enporti VPN-konekton"
 
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"La dosiero “%s” ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn "
-"informojn\n"
+"La VPN-kromprogramo malsukcesis korekte importi la VPN-konekton\n"
 "\n"
-"Eraro: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "nekonata eraro"
+"Eraro: neniu speco de VPN-servo."
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Elekti enportendan dosieron"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Malfermi"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Elporti VPN-konekton…"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3092,78 +3201,85 @@ msgstr ""
 "La dialogujo por la konekto-redaktilo ne estis pravalorizebla pro nekonata "
 "eraro."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Ne eblis krei novan konekton"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Forigo de konekto malsukcesis"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ĉu vi certe volas forigi la konekton %s?"
 
-#: ../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:1118
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-konektoj"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adreso"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Retmasko"
 
-#: ../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:1156
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Kluzo"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metra"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefikso"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Redaktante %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Redaktante sennoman konekton"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Mankas konktonomo"
 
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Pravalorizado de redaktilo…"
 
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Aldono de konekto malsukcesis"
 
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3171,265 +3287,291 @@ msgstr ""
 "La konektoredaktilo ne povis trovi kelkajn neprajn risurcojn (la .ui-dosiero "
 "ne estis trovita)."
 
-#: ../src/connection-editor/nm-connection-editor.c:574
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Kon_servi"
 
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Konservi ĉiujn ŝanĝojn faritajn al tiu ĉi konekto."
 
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Aŭtentigi por konservi ĉi tiun konekton por ĉiuj uzantoj de ĉi tiu komputilo."
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Ne eblis krei konekton"
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ne eblis redakti konekton"
 
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Eraro dum kreo de dialogujo por konekto-redaktilo."
 
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: src/connection-editor/nm-connection-editor.c:742
 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:755
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Eraro dum pravalorizado de redaktilo"
 
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Aldono de konekto malsukcesis"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nomo de konekto:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "E_lporti…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Reetikedi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Reetikedi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "neniam"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "nun"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Antaŭ %d minuto"
 msgstr[1] "Antaŭ %d minutoj"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Antaŭ %d horo"
 msgstr[1] "Antaŭ %d horoj"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Antaŭ %d tago"
 msgstr[1] "Antaŭ %d tagoj"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Antaŭ %d monato"
 msgstr[1] "Antaŭ %d monatoj"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Antaŭ %d jaro"
 msgstr[1] "Antaŭ %d jaroj"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 #, fuzzy
 msgid "Connection cannot be deleted"
 msgstr "Aldono de konekto malsukcesis"
 
-#: ../src/connection-editor/nm-connection-list.c:448
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Elektu konekton por redakti"
 
-#: ../src/connection-editor/nm-connection-list.c:450
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Elektu konekton por forigi"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Laste uzita"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Redaki elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Aŭtentigi por redakti la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Forigi la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Vi devas aŭtentigi por forigi la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Nesubtenata speco de poŝtelefona larĝkapacita konekto."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ne scias kiel krei konektojn per “%s”"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Eraro dum redakto de konekto"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Eraro dum kreo de konekto"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Aldono de konekto malsukcesis"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ne scias kiel krei konektojn per “%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Eraro dum redakto de konekto"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Ne trovis konekton kun UUID “%s”"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Retkonektoj"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Aldoni novan konekton"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-sekureco"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj."
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
-#: ../src/connection-editor/page-bluetooth.c:173
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "nevalida Bludento-aparato (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:256
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Pont-konekto %d"
 
-#: ../src/connection-editor/page-bluetooth.c:306
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:324
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:329
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:334
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "unuarange"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Pont-konekto %d"
 
-#: ../src/connection-editor/page-bridge.c:236
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-bridge.c:352
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Drata konekto %d"
@@ -3437,38 +3579,38 @@ msgstr "Drata konekto %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
-#: ../src/connection-editor/page-dsl.c:203
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
-#: ../src/connection-editor/page-dsl.c:298
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "mankas gepatra interfaco"
 
-#: ../src/connection-editor/page-dsl.c:343
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-konekto %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3476,58 +3618,57 @@ msgid ""
 "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 msgstr ""
 "Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia "
-"permanenta MAC-adreso enigita tien ĉi. Ekzemploj: “em1”, “3C:97:0E:42:1A:19”"
-", “em1 (3C:97:0E:42:1A:19)”"
+"permanenta MAC-adreso enigita tien ĉi. Ekzemploj: “em1”, "
+"“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ignorite"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Eterreto"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klonita MAC-adreso"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Drata konekto %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3536,202 +3677,192 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 "Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia "
-"permanenta MAC-adreso enigita tien ĉi. Ekzemploj: “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)”"
+"permanenta MAC-adreso enigita tien ĉi. Ekzemploj: “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)”"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Aŭtomata (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Nur aŭtomataj adresoj (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Aŭtomate, nur adresoj"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Aŭtomata (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Nur aŭtomataj adresoj (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Aŭtomata (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Nur aŭtomataj adresoj (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Nur \"Ligi-Loke\""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_DNS-serviloj:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "S_erĉi domajnojn:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redaktanta IPv4-kurson por %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Agordoj por IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:179
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Aŭtomate, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redaktanta IPv6-kursoj por %s"
 
-#: ../src/connection-editor/page-ip6.c:1208
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Agordoj por IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1210
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Ne eblas ŝargi IPv6-uzantinterfacon."
 
-#: ../src/connection-editor/page-ip6.c:1302
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1310
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1319
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1361
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-macsec.c:192
+#: src/connection-editor/page-macsec.c:189
 #, fuzzy
-#| msgid "Could not load Wi-Fi user interface."
 msgid "Could not load MACsec user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "MACSEC connection %d"
 msgstr "MACSEC-konekto %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Ne eblas ŝargi uzinterfacon por poŝtelefona larĝkapacita reto."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nesubtenata speco de poŝtelefona larĝkapacita konekto."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Elektu specon de poŝtelefona larĝkapacita provizanto"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3740,87 +3871,87 @@ msgstr ""
 "Elektu la teĥnologion uzatan de via poŝtelefona larĝkapacita provizanto. Se "
 "vi ne certas, demandu vian provizanton."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mia provizanto uzas _GSM-bazitan teĥnologion (ekz. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mia provizanto uzas C_DMA-bazitan teĥnologion (ekz. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "neniu"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Redaktanta PPP-metodojn de aŭtentigo por %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Agordoj por PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Ne eblis ŝargi PPP-uzantinterfacon."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Drata konekto %d"
@@ -3828,11 +3959,11 @@ msgstr "Drata konekto %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
@@ -3840,58 +3971,57 @@ msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Neniu konekto…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN-konekto %d"
 
-#: ../src/connection-editor/page-vpn.c:67
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Ne eblis ŝargi VPN-kromprograman servon por “%s” (%s)."
 
-#: ../src/connection-editor/page-vpn.c:68
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "nekonata paneo"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Ne eblis ŝargi VPN-uzantointerfacon."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Ne eblis trovi VPN-kromprogramon por “%s”."
 
-#: ../src/connection-editor/page-vpn.c:202
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-konekto %d"
 
-#: ../src/connection-editor/page-vpn.c:208
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Elekti VPN-konekttipon"
 
-#: ../src/connection-editor/page-vpn.c:209
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3902,7 +4032,7 @@ msgstr ""
 "dezirata VPN-speco ne disponeblas en la listo, eble vi ne instalis la ĝustan "
 "VPN-kromprogramon."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3911,7 +4041,7 @@ msgstr ""
 "Ĉi tiu opcio limigas ĉi tiun konekton al la sendrata retkaptejo (AP) "
 "specifita per la BSSID enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3922,99 +4052,97 @@ msgstr ""
 "permanenta MAC-adreso enigita tien ĉi. Ekzemploj: “wlan0”, "
 "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Iu aparato"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bita ŝlosilo (Deksesuma aŭ ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamika WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA kaj WPA2 por enterprenoj"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj ĉar "
 "mankas agordojn por sendrataj konektoj."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Sekureco de sendrataj konektoj"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Dosiero nomita “%s” jam ekzistas."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ĉu vi volas anstataŭigi %s per la VPN-konekto vi estas konservanta?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Ne eblas elporti VPN-konekton"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4025,226 +4153,105 @@ msgstr ""
 "\n"
 "Eraro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Elporti VPN-konekton…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Malŝlosi"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Konektinformoj"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr ""
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktivaj retkonektoj"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Atestilo ne estas agordita"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Elektu atestilon de %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "%s privata ŝ_losilo:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "%s _pasvorto por ŝlosilo:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Elektu atestilon de %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "%s _atestilo:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Via aparato:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Via provizanto:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Via faktura reĝimo:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto uzante "
-"la de vi elektitajn agordojn. Se la konekto malsukcesas aŭ vi ne povas "
-"atingi retajn fontojn, rekontrolu viajn agordojn. Por modifi viajn agordojn "
-"por poŝtelefona larĝkapacita konekto, elektu “Retkonektoj”-n el la menuo "
-"Sistemo → Agordoj."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mia lando ne estas listigita"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nelistigite"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Elekti vian planon:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Elekti planon - _APN (Access Point Name, nomo de retkaptejo):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via "
-"larĝkapacita konto, aŭ eble preventas konekteblon.\n"
-"\n"
-"Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la "
-"APN de via plano."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Elekti vian fakturo-planon"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Mia plano estas nelistigite…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Elekti vian provizanton el _listo:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provizanto"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Provizanto:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Mia provizanto uzas GSM-teĥnologion (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Mia provizanto uzas CDMA-teĥnologion (1XRRT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Elekti vian provizanton"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Landa aŭ regiona listo:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Lando aŭ regiono"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mia lando ne estas listigita"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Elekti la landon aŭ regionon de via provizanto"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instalis GSM-aparaton"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instalis CDMA-aparaton"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Iu aparato"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova poŝtelefona larĝkapacita konekto"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4252,186 +4259,266 @@ msgstr ""
 "Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan "
 "konekton al portebla (3G) reto."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vi bezonos la sekvajn informojn:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "La nomon de via larĝkapacita provizanto"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "La nomon de la fakturplano de via larĝkapacita provizanto"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la "
 "fakturplano"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Krei konekton por _tiu ĉi larĝkapacita aparato:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Iu aparato"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Agordi poŝtelefonan larĝkapacitan konekton"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova poŝtelefona larĝkapacita konekto"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Lando aŭ regiono"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Elekti la landon aŭ regionon de via provizanto"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Elekti vian provizanton el _listo:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mia provizanto uzas GSM-teĥnologion (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mia provizanto uzas CDMA-teĥnologion (1XRRT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Elekti vian provizanton"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Elekti vian planon:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Elekti planon - _APN (Access Point Name, nomo de retkaptejo):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via "
+"larĝkapacita konto, aŭ eble preventas konekteblon.\n"
+"\n"
+"Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la "
+"APN de via plano."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Elekti vian fakturo-planon"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Via aparato:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Via provizanto:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Via faktura reĝimo:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto uzante "
+"la de vi elektitajn agordojn. Se la konekto malsukcesas aŭ vi ne povas "
+"atingi retajn fontojn, rekontrolu viajn agordojn. Por modifi viajn agordojn "
+"por poŝtelefona larĝkapacita konekto, elektu “Retkonektoj”-n el la menuo "
+"Sistemo → Agordoj."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(Neniu)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Atestilo in %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Nekonate)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Elektu atestilon de %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "%s permesila _pasvorto:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Eraro dum malfermo de seanco: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Malŝlosi"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Ĉiam postuli tiun pasvorton"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "La pasvorto ne estas bezonata"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "M_ontri pasvortojn"
+
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
-msgid "_Secondary Password:"
+msgid "_Tertiary Password:"
 msgstr "_Duaranga pasvorto:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "_Tertiary Password:"
+msgid "_Secondary Password:"
 msgstr "_Duaranga pasvorto:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "M_ontri pasvortojn"
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Pasvorto:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Malkonekti"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamika WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "K_rei"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4439,35 +4526,35 @@ msgstr ""
 "Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
 "“%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Aŭtentigo por sendrata reto estas postulata"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Sendrata reto postulas aŭtentigon"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Krei novan sendratan reton"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nova sendrata reto"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Entajpu nomon por la sendrata reto kiun vi volas krei."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konekti al kaŝita sendrata reto"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Kaŝita sendrata reto"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4475,35 +4562,55 @@ msgstr ""
 "Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
 "volas konekti."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Sendrata _sekureco:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Ko_nekto:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Sendrata _adaptilo:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Provizanto:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Landa aŭ regiona listo:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Lando aŭ regiono"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Drata"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4513,17 +4620,39 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Sendrata _sekureco:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ret_nomo:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ko_nekto:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Sendrata _adaptilo:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Uzo:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4531,7 +4660,7 @@ msgstr ""
 "Tiu ĉi programo estas parto de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4539,386 +4668,450 @@ msgstr ""
 "Ĝi ne estas celata por komandlinia interago sed anstataŭe ruliĝas en la "
 "GNOME-labortabla ĉirkaŭaĵo."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ne enŝaltite"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistrite"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hejmreto (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Hejmreto"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "serĉante"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrado malpermesita"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s retmigrado)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (retmigrado)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Retmigra reto (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Retmigra reto"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-kodo por SIM-karto “%s” ĉe “%s”"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kodo bezonatas"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Port-larĝkapacita aparato bezonas PIN-kodon"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Poŝtelefona larĝkapacita konekto “%s” aktivas: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "retmigrado"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s-konekto"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER- aŭ PEM-atestiloj (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "Privataj ŝlosiloj de specoj DER, PEM aŭ PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "neniu CA-atestilo estas elektita"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Elekti PAC-dosieron"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-dosieroj (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Sennoma"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Aŭtentokontrolata"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../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:3
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Senno_ma idento:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC-_dosiero:"
 
-#: ../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:1
-msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Ena aŭtentigo:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permesi aŭtomatan PAC-pro_vizadon"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA-atestilo ne estas _bezonata"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Versio de PEAP:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
-msgid "_Domain:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "128-bita WEP-pasfrazo"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "M_ontri pasvortojn"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "neniu uzanto-atestilo estas elektita"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "I_dento:"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (sen EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunelita TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protektita EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Aŭ_tentigo:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Malferma sistemo"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunhavigita ŝlosilo"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (defaŭlte)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "Ŝ_losilo:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Montri ŝlosilon"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP-inde_kso:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipo:"
 
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Reĝi_mo:"
+#~ msgid "%s (default)"
+#~ msgstr "%s (defaŭlte)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorite"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Malsukcesis ĝisdatigi konektosekretojn pro nekonata eraro."
+
+#~ msgid "2:"
+#~ msgstr "2:"
+
+#~ msgid "3:"
+#~ msgstr "3:"
+
+#~ msgid "4:"
+#~ msgstr "4:"
 
 #, fuzzy
-#~ msgid "MTU"
-#~ msgstr "_MTU:"
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Konektaj _informoj:"
+
+#~| msgid "M_ode:"
+#~ msgid "Mode:"
+#~ msgstr "Reĝimo:"
+
+#~| msgid "_MTU:"
+#~ msgid "MTU:"
+#~ msgstr "MTU:"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Ne eblas enporti VPN-konekton"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "La dosiero “%s” ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn "
+#~ "informojn\n"
+#~ "\n"
+#~ "Eraro: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "nekonata eraro"
 
 #~ msgid "DSL"
 #~ msgstr "DSL"
@@ -4966,15 +5159,6 @@ msgstr "_Tipo:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aŭt_omate intertrakti"
 
@@ -5206,15 +5390,6 @@ msgstr "_Tipo:"
 #~ msgid "BSID:"
 #~ msgstr "_BSID:"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "Unuaranga DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Duaranga DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Triaranga DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_Aparatara MAC-adreso:"
 
@@ -5367,9 +5542,6 @@ msgstr "_Tipo:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Sendrata konekto %d"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Konekti _aŭtomate"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Disponebla al ĉiuj uzantoj"
 
diff --git a/po/es.po b/po/es.po
index 1e3562dd..8f214f2b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,9 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager-applet.master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-05-06 16:46+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-05-16 10:27+0200\n"
 "Last-Translator: Rodrigo Lledó <rodhos92@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Generator: Gtranslator 3.32.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198 src/applet-dialogs.c:737
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
 #: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Red"
@@ -106,7 +106,6 @@ msgstr ""
 "Se usa para determinar si los ajustes de deben migrar a la nueva versión."
 
 #: org.gnome.nm-applet.gschema.xml.in:31
-#| msgid "Disable Wi-Fi Create"
 msgid "Disable WiFi Create"
 msgstr "Desactivar la creación de red inalámbrica"
 
@@ -457,117 +456,117 @@ msgstr "el dispositivo no está gestionado"
 msgid "No network devices available"
 msgstr "No hay dispositivos de red disponibles"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Conexiones _VPN"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Añadir una conexión VPN…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "El Gestor de la red no se está ejecutando…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Red desactivada"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activar _red"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Activar _inalámbrica"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la banda ancha _móvil"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activar n_otificaciones"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Información de la conexión"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Editar las conexiones…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Ahora está conectado a «%s»."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "La conexión de red se ha desconectado."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparando la conexión de red «%s»…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Se necesita autenticación de usuario para la conexión de red «%s»…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Solicitando una dirección de red para «%s»…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexión de red «%s» activa"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Iniciando conexión VPN «%s»…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Se necesita autenticación de usuario para la conexión VPN «%s»…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Solicitando una dirección VPN para «%s»…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Conexión VPN activa"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Sin conexión de red"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación Gestor de la red"
 
@@ -885,17 +884,14 @@ msgid "Subnet Mask"
 msgstr "Máscara de subred"
 
 #: src/applet-dialogs.c:440
-#| msgid "Primary DNS:"
 msgid "Primary DNS"
 msgstr "DNS primario"
 
 #: src/applet-dialogs.c:440
-#| msgid "Secondary DNS:"
 msgid "Secondary DNS"
 msgstr "DNS secundario"
 
 #: src/applet-dialogs.c:440
-#| msgid "Ternary DNS:"
 msgid "Tertiary DNS"
 msgstr "DNS terciario"
 
@@ -945,7 +941,6 @@ msgid "Speed"
 msgstr "Velocidad"
 
 #: src/applet-dialogs.c:616
-#| msgid "Security:"
 msgid "Security"
 msgstr "Seguridad"
 
@@ -969,7 +964,6 @@ msgid "Hotspot"
 msgstr "Punto de acceso"
 
 #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
-#| msgid "Password:"
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1120,16 +1114,16 @@ msgstr "Introducir de nuevo el código PIN nuevo:"
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "La conexión no tiene configurada una VPN"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Falló al escribir la conexión a la UI de VPN: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Falló al escribir la conexión a la IU de la VPN: escritura incompleta"
 
@@ -3907,12 +3901,12 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mi proveedor usa tecnología basada en C_DMA (ej. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4234,32 +4228,28 @@ msgstr "_certificado %s"
 msgid "My country is not listed"
 msgstr "Mi país no está en la lista"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mi plan no está en la lista…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveedor"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País o región"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Cualquier dispositivo"
 
@@ -4291,23 +4281,24 @@ msgstr "El nombre de su plan de precios"
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(En algunos casos) su plan de precios APN (nombre del punto de acceso)"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crear una conexión para es_te dispositivo de banda ancha móvil:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar una conexión de banda ancha móvil"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista de países o regiones:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o región"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Elegir el país o la región de su proveedor"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Seleccionar su proveedor de la _lista:"
 
@@ -4584,6 +4575,14 @@ msgstr "No puedo encontrar mi proveedor y querría introducirlo _manualmente:"
 msgid "Provider:"
 msgstr "Proveedor:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista de países o regiones:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País o región"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Cableado"
diff --git a/po/et.po b/po/et.po
index b3263213..1f0fba26 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,8 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager MASTER\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-03-13 02:52+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
@@ -25,91 +26,101 @@ msgstr ""
 "X-Poedit-Language: Estonia\n"
 "X-Poedit-Country: ESTONIAN\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Võrk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Võrguühenduste haldamine"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Võrguühendused"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktiivsed võrguühendused"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Võrguühenduse sätete haldus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Ühendumise saavutamisest ei teatata"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Kui tõene, siis on võrguga ühendumise teated keelatud."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Ühenduse katkemisest ei teatata"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Kui tõene, siis on võrguühenduse katkemise teated keelatud."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN teadete keelamine"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "Kui tõene, siis on VPN ühenduse loomise ja katkemise teated keelatud."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Saadaolevatest võrkudest ei teatata"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "Kui tõene, siis on saadaolevatest Wi-Fi võrkudest teatamine keelatud."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Tempel"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Kasutatakse, et kindlaks teha, millal tuleb sätteid uuendada järgmisele "
 "versioonile."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi loomine keelatud"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "Kui tõene, siis on adhoc võrgu loomine rakendi abil keelatud."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Rakendit näidatakse teatealas"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "Määra väärtuseks FALSE, et keelata rakendi näitamine teatealas."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -117,7 +128,7 @@ msgstr ""
 "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
 "EAP autentimisel."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -125,130 +136,143 @@ msgstr ""
 "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
 "EAP autentimise teises faasis."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Võrguhalduri rakend"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Võrguühendus puudub"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Võrguhalduri rakend"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X autentimine"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Võrgu nimi:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Ühenduse lisamine/aktiveerimine nurjus"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Ühendus nurjus"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Seadmega ühenduse katkestamine nurjus"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Ühenduse katkestamine nurjus"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Ühenduse aktiveerimine nurjus"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ära seda uuesti näita"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -258,7 +282,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' katkes, kuna võrguühendus katkestati."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna võrguühendus katkestati."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus peatus ootamatult."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus tagastas vigase seadistuse."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna ühendumise katse aegus."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus ei käivitunud õigeaegselt."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenuse käivitamine nurjus."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna ei leitud sobivat VPN'i parooli."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus sobimatu VPN'i parooli tõttu."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ühenduse loomine edukas.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN'i sisselogimise teade"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-ühendus nurjus"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -377,7 +401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,561 +414,586 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "seade pole valmis (puudub püsivara)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "seade pole valmis"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ühendamata"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "seade pole hallatud"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Võrguseadmeid ei leitud"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-ühendused"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Seadista VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN-ühendused"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Võrguhaldur ei tööta..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Võrguühendused keelatud"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Võrguühendused lubatud"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Wi-Fi ühendused lubatud"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiiliühendus lubatud"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Teated lubatud"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Ü_henduse andmed"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Ühenduste muutmine..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Programmist lähemalt"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Oled nüüd ühendatud võrku '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Ühendus katkestatud"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Võrguühendus katkes."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Võrguühenduse '%s' ettevalmistamine..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Võrguühenduse '%s' jaoks on vajalik kasutaja autentimine..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Võrguaadressi pärimine võrgu '%s' jaoks..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Võrguühendus '%s' on aktiivne"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN-ühenduse '%s' alustamine..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN-ühenduse '%s' jaoks on vajalik kasutaja autentimine..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "VPN'i aadressi pärimine võrgu '%s' jaoks..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-ühendus '%s' on aktiivne"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Võrguühendus puudub"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Võrguhalduri rakend"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Vale PUK-kood; võta ühendust oma teenusepakkujaga."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Vale PIN-kood; võta ühendust oma teenusepakkujaga."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Luku avamise koodi saatmine..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiiliühendus (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobiiliühendus"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Saadaval"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Uus mobiiliühendus"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Ühendus loodud"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Oled nüüd ühendatud mobiiliinternetti."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobiiliühenduse võrk."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Oled nüüd ühendatud koduvõrku."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Oled nüüd ühendatud rändlusvõrku (roaming)."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Oled nüüd ühendatud mobiiliinternetti."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Mobiiliühenduse '%s' ettevalmistamine..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mobiiliühenduse '%s' häälestamine..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Kasutaja autentimine on vajalik mobiiliühenduse '%s' jaoks..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobiiliühendus '%s' on aktiivne"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automaatne juhtmega ühendus"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet võrgud (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet võrk (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet võrgud"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet võrk"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Oled nüüd ühendatud ethernet võrku."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ethernet võrgu ühenduse '%s' ettevalmistamine..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Ethernet võrgu ühenduse '%s' häälestamine..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Ethernet võrguühenduse '%s' jaoks on vajalik kasutaja autentimine..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Võrguaadressi pärimine ethernet võrgu '%s' jaoks..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet võrguühendus '%s' on aktiivne"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentimine"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Varjatud Wi-Fi võrku ühendumine"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Uue Wi-Fi võrgu loomine"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Uut ühendust pole võimalik lisada"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi võrgud (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi võrk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi võrk"
 msgstr[1] "Wi-Fi võrgud"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi on keelatud"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi on keelatud riistvaralisest lülitist"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Veel võrke"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi võrgud on saadaval"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi võrku ühendumiseks kasuta võrgumenüüd"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Oled nüüd ühendatud Wi-Fi võrku '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi võrgu '%s' ühenduse ettevalmistamine..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi võrgu '%s' ühenduse häälestamine..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi võrgu '%s' jaoks on vajalik kasutaja autentimine..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Võrguaadressi pärimine Wi-Fi võrgu '%s' jaoks..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi ühendus võrku '%s' on aktiivne: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi võrguühendus '%s' on aktiivne"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Ühenduse aktiveerimine nurjus"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Viga ühenduse andmete kuvamisel:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dünaamiline WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Aadressid"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Puudub"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (vaikimisi)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tundmatu"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-aadress"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Eetri aadress"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Alamvõrgu mask"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Esmane DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Teisene DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Kolmas DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Üldine"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Liides"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Riistvara aadress"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Draiver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Kiirus"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Turvalisus:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Vaikimisi marsruut"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Eiratakse"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Parool:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPNi liik"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPNi lüüs"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPNi kasutajanimi"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-i pealkiri (banner)"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Baasühendus"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tundmatu"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Sobivaid aktiivseid ühendusi pole!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -952,16 +1001,20 @@ msgstr ""
 "Autoriõigused © 2005-2008 Novell, Inc.\n"
 "ja paljud teised kaasosalised ja tõlkijad kogukonnast"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Teateala rakend võrguühenduste ja seadmete haldamiseks."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Võrguhalduri veebileht"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -969,33 +1022,33 @@ msgstr ""
 "Võrguhalduri rakend ei suutnud leida vajalikke allikaid (.ui faili ei "
 "leitud)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Puuduvad allikad"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobiiliühenduse võrguparool"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Võrku '%s' ühendumiseks on vaja parooli."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Vajalik on SIM-kaardi PIN-kood"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Vajalik on SIM-kaardi PIN-kood"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1057,25 @@ msgstr ""
 "Mobiiliühenduse seadme '%s' kasutamiseks on vajalik SIM-kaardi PIN-kood."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kood:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Näita PIN-koodi"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Vajalik on SIM-kaardi PUK-kood"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Vajalik on SIM-kaardi PUK-kood"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1031,35 +1084,42 @@ msgstr ""
 "Mobiiliühenduse seadme '%s' kasutamiseks on vajalik SIM-kaardi PUK-kood."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kood:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Uus PIN-kood:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Uus PIN-kood uuesti:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Näita PIN/PUK-koodi"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Ühenduse andmed"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN-ühenduse loomine nurjus: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1067,41 +1127,41 @@ msgid ""
 msgstr ""
 "IP-aadress on arvuti nimi võrgus. Klõpsa \"Lisa\", et lisada IP-aadress."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Automaatselt saadud marsruute _eiratakse"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Ü_hendust kasutatakse ainult selle kohtvõrgu jaoks"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1109,16 +1169,16 @@ msgstr ""
 "Kui märgitud, ei kasutata seda ühendust mitte kunagi vaikimisi "
 "võrguühendusena."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Loo…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Ühenduse liigi valimine"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1130,85 +1190,100 @@ msgstr ""
 "Kui soovid luua VPN ühendust ning soovitud VPN ühenduse liiki nimekirjas ei "
 "leidu, võib vajalik VPN plugin olla paigaldamata."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Teenus:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktiivne varundus"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Eetriaadress"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Kohanev ülekande koormuse jaotus"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Kohanev koormusjaotus"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (soovitatud)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Liitühendused (bonded):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Režiim:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Muuda"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Monitoorimise _sagedus:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Liidese nimi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Ü_henduse monitooring:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _sihtkohad:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1216,124 +1291,184 @@ msgstr ""
 "IP-aadress või komadega eraldatud IP-aadresside loetelu, millega "
 "kontrollitakse ühenduse toimimist."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Link _maas viivitus:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Link _püsti viivitus:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Esmane DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "Ülekandeühiku piirsuurus (_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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "baiti"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Marsruudi _hind:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hairpin režiim:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "_Sildühendused:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Edastamise viivitus:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Tervitusaeg:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Võrguühendused lubatud"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP lubamine (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Suurim vanus:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Vananemise aeg:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automaatne"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "vaikimisi"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "_Wi-Fi ühendused lubatud"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1344,444 +1479,538 @@ msgstr ""
 "riistvaralise aadressina. Seda võimalust tuntakse ka MAC-i kloonimise või "
 "petmisena. Näiteks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Aadress"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Aadress"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN liidese _nimi:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Riistvara aadress:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Iga seade"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Tundmatu vea tõttu nurjus ühenduse paroolide uuendamine."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Sellel ühendusel 802.1_X turvalisuse kasutamine"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "_Wi-Fi ühendused lubatud"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_Prioriteet:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Kasutajanimi:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Teenus:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Näita parooli"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Parool:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Liides"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Vanemliides:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Vanemliides:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Pöördpaar (TP, twisted pair)"
 
 # see on ajaloo tunnist välja astunud: http://en.wikipedia.org/wiki/Attachment_Unit_Interface
 # seda vist elusuuruses ei näe
 # muidu lisaseadme liides kõlaks küll
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Meediumist sõltumatu liides (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Teenus:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Kloonitud MAC-aadress:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Privaatvõtme parool:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Vaikimisi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Eira"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Eetriaadress"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Privaatvõtme parool:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Kiirus:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "_Täisdupleks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Selle ühendusega koos ühendutakse automaatselt _VPN võrku"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Jah"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Ei"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "_Kõik kasutajad võivad selle võrguga ühenduda"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Automaatne ühendumine selle võrguga, kui saadaval"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Selle ühendusega koos ühendutakse automaatselt _VPN võrku"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Ü_henduse andmed"
+msgid "Firewall _zone"
+msgstr "Tulemüüri _tsoon:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Liitühendused (bonded):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Automaatne ühendumine"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "Tulemüüri _tsoon:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1789,7 +2018,7 @@ msgid ""
 msgstr ""
 "IP-aadress on arvuti nimi võrgus. Klõpsa \"Lisa\", et lisada IP-aadress."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1797,128 +2026,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automaatne, ainult aadressid"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Aadressid"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Transportrežiim:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Transportrežiim:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Seadme nimi + number"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Režiim:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "Ülekandeühiku piirsuurus (_MTU):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automaatne käsitsi DNS sätetega"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Jagab teistele arvutitele"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Meetod:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1929,8 +2162,8 @@ msgstr ""
 "määrata eriseadistuse. Kui soovid kasutada DHCP kliendi identifikaatorit, "
 "sisesta see siia."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1938,25 +2171,26 @@ msgstr ""
 "Domeenid, mida kasutatakse hostinimede lahendamisel. Mitu domeeni eralda "
 "komaga."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP kliendi ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Otsidomeenid:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS-serverid:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1964,11 +2198,11 @@ msgstr ""
 "Domeeninimeserverite IP-aadresse kasutatakse hostinimede lahendamiseks. "
 "Mitme domeeninimeserveri kasutamiseks eralda need komadega."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Selle ühenduse loomiseks tuleb nõuda IPv_4 aadressi"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1976,25 +2210,35 @@ msgstr ""
 "Ühendumisel IPv6 võrkudega lõpetatakse ühendumine edukalt ka siis, kui IPv4 "
 "seadistamine nurjub ja IPv6 seadistamine õnnestub."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Marsruudid…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Keelatud"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "_Wi-Fi ühendused lubatud"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2004,15 +2248,19 @@ msgstr ""
 "Domeeninimeserverite IP-aadresse kasutatakse hostinimede lahendamiseks. "
 "Mitme domeeninimeserveri kasutamiseks eralda need komadega."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Selle ühenduse loomiseks tuleb nõuda IPv_6 aadressi"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2020,756 +2268,861 @@ msgstr ""
 "Ühendumisel IPv4 võrkudega lõpetatakse ühendumine edukalt ka siis, kui IPv6 "
 "seadistamine nurjub ja IPv4 seadistamine õnnestub."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Meetrika"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Põhiline"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Number:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Täpsemalt"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_Võrgu ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "_Muuda..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "_Roaming on lubatud, kui koduvõrk pole saadaval"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Näita paroole"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Lubatud viisid:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "_Meetodite seadistamine…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Tihendus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Point-to-Point krüpteeringu kasutamine (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_128-bitine krüpteerimine nõutud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_Stateful-MPPE kasutamine"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD-tihendamine lubatud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate-tihendamine lubatud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP _päiste tihendamine lubatud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Kaja"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Saadetakse PPP _echo pakette"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Meetod:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Puudub"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "VPN-ühenduse seadistuse importimine..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Meetod:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Täpsemalt"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet võrgud"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioriteet:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Privaat_võti:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Link _maas viivitus:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Link _püsti viivitus:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Vanemliides:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _sihtkohad:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _sihtkohad:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "VPN-ühenduse seadistuse importimine..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Liitühendused (bonded):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Riistvara aadress:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Riistvara aadress:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioriteet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Saatja _võimsus:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Saatja _võimsus:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Vanemliides:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN liidese _nimi:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Kloonitud MAC-aadress:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLANi _ID:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Seadme nimi + number"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Turvalisus:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Saatja _võimsus:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Kiirus:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Sagedus:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Lubatud autentimismeetodid"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Laiendatav autentimisprotokoll"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Parooliga autentimisprotokoll"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake autentimisprotokoll (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsofti Challenge Handshake autentimisprotokoll (MCHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Microsofti Challenge Handshake autentimisprotokolli versioon 2 (MCHAP v2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2778,191 +3131,186 @@ msgstr ""
 "Tavaliselt toetab PPP teenusepakkuja server kõiki autentimisviise. Kui "
 "ühendus siiski nurjub, proovi mõne viisi keelamist."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Liitühendus (bond)"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Sild"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN plugin ei suutnud VPN ühendust korrektselt importida\n"
-"\n"
-"Viga: puudub VPN teenuse tüüp."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN-ühendust pole võimalik importida"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Faili '%s' ei saanud lugeda või ei sisaldanud see äratuntavat VPN ühenduse "
-"teavet\n"
+"VPN plugin ei suutnud VPN ühendust korrektselt importida\n"
 "\n"
-"Viga: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Tundmatu viga"
+"Viga: puudub VPN teenuse tüüp."
 
 # importimise dialoogi pealkiri
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Importimiseks faili valimine"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuaalne"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "VPN-ühenduse seadistuse importimine..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Ühenduse redaktori dialoogi pole tundmatu vea tõttu võimalik lähtestada."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Uut ühendust pole võimalik luua"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Ühenduse kustutamine nurjus"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Kas sa oled kindel, et tahad kustutada ühenduse %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-ühendused"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Aadress"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Võrgumask"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Lüüs (gateway)"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Meetrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Ühenduse %s muutmine"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Nimetu ühenduse muutmine"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Ühenduse _nimi:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Viga redaktori lähtestamisel"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Ühenduse lisamine nurjus"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2970,55 +3318,52 @@ msgstr ""
 "Ühenduste redigeerija ei suutnud leida vajalikke allikaid (.ui faili ei "
 "leitud)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Salvesta kõik sellele ühendusele tehtud muudatused."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Selle ühenduse salvestamiseks selle arvuti kõigi kasutajate jaoks pead end "
 "autentima."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Ühendust pole võimalik luua"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ühendust pole võimalik muuta"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Tundmatu viga ühenduse muutmise dialoogi loomisel."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Viga redaktori lähtestamisel"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Ühenduse lisamine nurjus"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3027,199 +3372,245 @@ msgstr ""
 "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
 "EAP autentimisel."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Ühenduse _nimi:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Eksportimine..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "mitte kunagi"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "nüüd"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut tagasi"
 msgstr[1] "%d minutit tagasi"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tund tagasi"
 msgstr[1] "%d tundi tagasi"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päev tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuu tagasi"
 msgstr[1] "%d kuud tagasi"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d aasta tagasi"
 msgstr[1] "%d aastat tagasi"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Ühenduse lisamine nurjus"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL-ühendus %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL-ühendus %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Viimati kasutatud"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Valitud ühenduse muutmine"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Valitud ühenduse muutmiseks pead end autentima"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Valitud ühenduse kustutamine"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Valitud ühenduse kustutamiseks pead end autentima"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Mobiiliühenduse liik pole toetatud."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ei tea, kuidas '%s' ühendust luua"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Viga ühenduse muutmisel"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Viga ühenduse loomisel"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Ühenduse lisamine nurjus"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ei tea, kuidas '%s' ühendust luua"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Viga ühenduse muutmisel"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Ei leitud ühendust UUID-ga '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Võrguühendused"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN-ühendused"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X turvalisus"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X turvalisuse kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Sellel ühendusel 802.1_X turvalisuse kasutamine"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Ethernet võrgu kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Liitühendus %d (bond)"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet võrk"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi võrk"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Liitühenduse (bond) kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Esmane DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Liitühendus %d (bond)"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Sildühenduse kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Sildühendus %d"
@@ -3227,33 +3618,38 @@ msgstr "Sildühendus %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Silla port"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Sildpordi kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Vanemliides:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-ühendus %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3263,44 +3659,43 @@ msgstr ""
 "See valik lubab ühendumise ainult seadmel, mille riistvaraline MAC-aadress "
 "on siia sisestatud. Näiteks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Eiratakse"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet võrgu kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Kloonitud MAC-aadress:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet võrgu ühendus %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3310,11 +3705,11 @@ msgstr ""
 "valimisel kasutatakse tulemüüri vaikimisi tsooni. Kasutatav ainult siis, kui "
 "firewalld on aktiivne."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Üldist kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3325,183 +3720,187 @@ msgstr ""
 "See valik lubab ühendumise ainult seadmel, mille riistvaraline MAC-aadress "
 "on siia sisestatud. Näiteks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-võrgu kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand võrgu ühendus %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ethernet võrgu ühendus %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automaatne (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automaatselt (VPN) ainult aadressid"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automaatne, ainult aadressid"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automaatne (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automaatselt (PPPoE) ainult aadressid"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automaatne (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automaatselt (DHCP) ainult aadressid"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Ainult Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "_DNS lisaserverid:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "_Lisaotsidomeenid:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Seadme %s IPv4-marsruutide muutmine"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 sätted"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automaatne, ainult DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Seadme %s IPv6-marsruutide muutmine"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 sätted"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX-võrgu kasutajaliidest pole võimalik laadida."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX ühendus %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s alluv %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Mobiiliühenduse kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Mobiiliühenduse liik pole toetatud."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mobiiliühenduse teenusepakkuja liigi valimine"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3510,7 +3909,7 @@ msgstr ""
 "Vali mobiiliühenduse pakkuja kasutatav tehnoloogia.  Kui sa pole kindel, "
 "küsi oma teenusepakkujalt."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Minu teenusepakkuja kasutab _GSM-il põhinevat tehnoloogiat (nt GPRS, EDGE, "
@@ -3518,85 +3917,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Minu teenusepakkuja kasutab C_DMA-l põhinevat tehnoloogiat (nt 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "puudub"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s PPP autentimisviiside muutmine"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP sätted"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Liitühenduse (bond) kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "VLAN kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL-ühendus %d"
@@ -3604,12 +3999,12 @@ msgstr "DSL-ühendus %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "Silla port"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Sildpordi kasutajaliidest pole võimalik laadida."
@@ -3617,58 +4012,58 @@ msgstr "Sildpordi kasutajaliidest pole võimalik laadida."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Võrguühendus puudub"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "VLAN kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-ühendus %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN kasutajaliidest pole võimalik laadida."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "VPN-i pluginat teenuse '%s' jaoks ei leitud."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "VPN-i pluginat teenuse '%s' jaoks ei leitud."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Ühendus nurjus"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN kasutajaliidest pole võimalik laadida."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "VPN-i pluginat teenuse '%s' jaoks ei leitud."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-ühendus %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN-ühenduse liigi valimine"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3678,7 +4073,7 @@ msgstr ""
 "Vali, mis liiki VPN ühendust kasutada. Kui soovitud VPN ühenduse liiki "
 "nimekirjas ei leidu, võib vajalik VPN plugin olla paigaldamata."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3687,7 +4082,7 @@ msgstr ""
 "See valik lubab ühenduda ainult siia sisestatud BSSID aadressiga Wi-Fi "
 "ruuteriga (AP). Näiteks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3697,96 +4092,94 @@ msgstr ""
 "See valik lubab ühendumise ainult seadmel, mille riistvaraline MAC-aadress "
 "on siia sisestatud. Näiteks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi-võrgu kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Iga seade"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi ühendus %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitine võti (Hex või ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitine parool"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dünaamiline WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 isiklik"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ettevõtte"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi-võrgu turvalisuse kasutajaliidest pole võimalik laadida; puudub Wi-Fi "
 "säte."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi turvalisus"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi-võrgu turvalisuse kasutajaliidest pole võimalik laadida."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Fail nimega \"%s\" on juba olemas."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Asenda"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Kas sa tahad asendada %s praegu salvestatava VPN ühendusega?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN-ühendust pole võimalik eksportida"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3798,481 +4191,464 @@ msgstr ""
 "Viga: %s."
 
 # eksportimise faili valiku pealkiri
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN-ühenduse eksportimine..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Võta lukust lahti"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Selle seadme luku automaatne avamine"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Ühenduse andmed"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktiivsed võrguühendused"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vali sertifitseerimiskeskuse sertifikaat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Privaat_võti:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Privaatvõtme parool:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Vali sertifitseerimiskeskuse sertifikaat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Kasutaja sertifikaart:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Sinu mobiiliühendus on seadistatud järgmiselt:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Sinu seade:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Sinu teenusepakkuja:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Sinu makseplaan:"
-
-# Ubuntul on siin "Arvuti > Eelistused"
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Nüüd luuakse ühendus sinu teenusepakkuja võrguga kasutades sinu valitud "
-"sätteid.  Kui ühendus nurjub või sa ei pääse võrgule ligi, kontrolli "
-"sätteid.  Mobiiliühenduse muutmiseks vali \"Võrguühendused\" menüüst Süsteem "
-"> Eelistused."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Mobiiliühenduse sätete kinnitamine"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Minu riik pole loetelus"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Pole loetelus"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Vali oma plaan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Valitud plaani _APN (Access Point Name, pöörduspunkti nimi):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Hoiatus: vale plaani valimine võib põhjustada makseprobleeme või tõkestada "
-"ühenduse loomist.\n"
-"\n"
-"Kui sa pole kindel, küsi oma teenusepakkujalt õige plaani APN (Access Point "
-"Name, pöörduspunkti nimi)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Makseplaani valimine"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Minu makseplaan pole loetelus..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Vali oma teenusepakkuja _loetelust:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Teenusepakkuja"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Teenusepakkuja:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr ""
-"Minu teenusepakkuja kasutab _GSM-tehnoloogiat (GPRS, EDGE, UMTS, HSDPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Minu teenusepakkuja kasutab _CDMA-tehnoloogiat (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Vali teenusepakkuja"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Riikide ja piirkondade nimekiri:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Riik või piirkond"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Minu riik pole loetelus"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Teenusepakkuja asukohariigi või -regiooni valimine"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Paigaldatud GSM-seade"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Paigaldatud CDMA-seade"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Iga seade"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Uus mobiiliühendus"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "See abiline teeb mobiilivõrgu (3G) ühenduse seadistamise lihtsaks."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vaja on alljärgnevat teavet:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Sinu teenusepakkuja nimi"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Sinu ühenduse makseplaani nimi"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(Mõnel juhul) sinu ühenduse makseplaani APN (Access Point Name, "
 "pöörduspunkti nimi)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Ühenduse loomine _selle mobiiliühenduse seadmega:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Iga seade"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobiiliühenduse seadistamine"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Uus mobiiliühendus"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Riik või piirkond"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Teenusepakkuja asukohariigi või -regiooni valimine"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Vali oma teenusepakkuja _loetelust:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr ""
+"Minu teenusepakkuja kasutab _GSM-tehnoloogiat (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Minu teenusepakkuja kasutab _CDMA-tehnoloogiat (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Vali teenusepakkuja"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Vali oma plaan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Valitud plaani _APN (Access Point Name, pöörduspunkti nimi):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Hoiatus: vale plaani valimine võib põhjustada makseprobleeme või tõkestada "
+"ühenduse loomist.\n"
+"\n"
+"Kui sa pole kindel, küsi oma teenusepakkujalt õige plaani APN (Access Point "
+"Name, pöörduspunkti nimi)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Makseplaani valimine"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Sinu mobiiliühendus on seadistatud järgmiselt:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Sinu seade:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Sinu teenusepakkuja:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Sinu makseplaan:"
+
+# Ubuntul on siin "Arvuti > Eelistused"
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Nüüd luuakse ühendus sinu teenusepakkuja võrguga kasutades sinu valitud "
+"sätteid.  Kui ühendus nurjub või sa ei pääse võrgule ligi, kontrolli "
+"sätteid.  Mobiiliühenduse muutmiseks vali \"Võrguühendused\" menüüst Süsteem "
+"> Eelistused."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Mobiiliühenduse sätete kinnitamine"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(puudub)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Sertifitseerimis_keskuse sert:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Tundmatu"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Vali sertifitseerimiskeskuse sertifikaat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Kasutaja sertifikaart:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Viga ühenduse muutmisel"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Võta lukust lahti"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Seda parooli küsitakse iga kord"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Võrku '%s' ühendumiseks on vaja parooli."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Parool:"
+msgid "Sh_ow passwords"
+msgstr "_Näita paroole"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Parool:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_Näita paroole"
+msgid "_Secondary Password:"
+msgstr "_Parool:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Parool:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Katkesta ühendus"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Puudub"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dünaamiline WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Loo"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Ligipääsuks Wi-Fi võrgule '%s' on vaja parooli või krüpteerimisvõtit."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi võrk nõuab salasõna"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi võrgu jaoks on vaja salasõna"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Uue Wi-Fi võrgu loomine"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Uus Wi-Fi võrk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Sisesta loodava Wi-Fi võrgu nimi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Varjatud Wi-Fi võrku ühendumine"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Varjatud Wi-Fi võrk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Sisesta varjatud Wi-Fi võrgu nimi ja parool."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi _turvalisus:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Ü_hendus:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi _adapter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ma ei leidnud oma teenusepakkujat, ma tahan selle sisestada _käsitsi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Teenusepakkuja:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Riikide ja piirkondade nimekiri:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Riik või piirkond"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Juhtmega"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC võrk"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4282,17 +4658,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi _turvalisus:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Võrgu nimi:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ü_hendus:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi _adapter:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Kasutus:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4300,7 +4698,7 @@ msgstr ""
 "See rakendus on võrguhalduri osa (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4308,415 +4706,471 @@ msgstr ""
 "See ei ole mõeldud käsurealt juhtimiseks, vaid GNOME töölauakeskkonnas "
 "kasutamiseks."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "pole lubatud"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "pole registreeritud"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Koduvõrk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Koduvõrk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "otsimine"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registreerimisest keelduti"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
 # see ei ole päris õige tõlge, aga võib-olla kajastab potentsiaalselt suuremat kulukust rohkem
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Välisriigi roaming-võrk (%s)"
 
 # see ei ole päris õige tõlge, aga võib-olla kajastab potentsiaalselt suuremat kulukust rohkem
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Välisriigi roaming-võrk"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%s' SIM kaardi PIN kood seadmes '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Vajalik on PIN-kood"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiiliühenduse seadmele on vaja PIN-koodi"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobiiliühendus '%s' on aktiivne: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "rändlus (roaming)"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s ühendus"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER või PEM sertifikaadid (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM või PKCS#12 privaatvõtmed (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC-faili lubamine..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC failid (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Kõik failid"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonüümne"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenditud"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Mõlemad"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anonüü_mne identiteet:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _fail:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Sise-autentimine:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automaatsed _PAC-klauslid on lubatud"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Vali sertifitseerimiskeskuse sertifikaadifail..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versioon 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versioon 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Sertifitseerimis_keskuse sert:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _versioon:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bitine parool"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Näita paroole"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentiteet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunnelis TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Kaitstud EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Autentimine:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (vaikimisi)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Avatud süsteem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Jagatud võti"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (vaikimisi)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Võti:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Näita võtit"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP inde_ks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Liik:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (vaikimisi)"
+
+#~ msgid "Ignored"
+#~ msgstr "Eiratakse"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Tundmatu vea tõttu nurjus ühenduse paroolide uuendamine."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Prioriteet:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Automaatne ühendumine selle võrguga, kui saadaval"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Ü_henduse andmed"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN-ühendust pole võimalik importida"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Faili '%s' ei saanud lugeda või ei sisaldanud see äratuntavat VPN "
+#~ "ühenduse teavet\n"
+#~ "\n"
+#~ "Viga: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Tundmatu viga"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Vali sertifitseerimiskeskuse sertifikaadifail..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Sertifitseerimis_keskuse sert:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Võrguhalduri rakend"
@@ -4750,15 +5204,6 @@ msgstr "_Liik:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 # Automaatne kokkulepe?
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegotiate"
@@ -4853,21 +5298,9 @@ msgstr "_Liik:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Teisene DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Kolmas DNS:"
-
-#~ msgid "Yes"
-#~ msgstr "Jah"
-
 #~ msgid "Only on activation"
 #~ msgstr "Ainult aktiveerumisel"
 
-#~ msgid "No"
-#~ msgstr "Ei"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_Seadme MAC-aadress:"
 
@@ -4922,12 +5355,6 @@ msgstr "_Liik:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Automaatselt (PPP) ainult aadressid"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX-võrgu kasutajaliidest pole võimalik laadida."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX ühendus %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4951,9 +5378,6 @@ msgstr "_Liik:"
 #~ msgid "Error: %s"
 #~ msgstr "Tõrge: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN-ühenduse loomine nurjus: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Sinu telefon on valmis kasutamiseks!"
 
@@ -5009,8 +5433,5 @@ msgstr "_Liik:"
 #~ msgid "Don't _warn me again"
 #~ msgstr "Ära enam _hoiata"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "_Automaatne ühendumine"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "_Saadaval kõigile kasutajatele"
diff --git a/po/eu.po b/po/eu.po
index 2553b269..ca62a19b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2015-01-08 16:41+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.org>\n"
@@ -19,49 +20,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Sarea"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Kudeatu sareko konexioak"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Sareko konexioak"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktibatu sareko konexioak"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Kudeatu eta aldatu sareko konexioen ezarpenak"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desgaitu konektatutako jakinarazpenak"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batera "
 "konektatzean."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desgaitu deskonektatutako jakinarazpenak"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko sare batetik "
 "deskonektatzean."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Desgaitu VPNren jakinarazpenak"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -69,52 +79,53 @@ msgstr ""
 "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko VPN batera "
 "konektatzean edo batetik deskonektatzean."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Ezabatu sare erabilgarrien jakinarazpenak"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Ezarri hau TRUE (egia) gisa jakinarazpenak desgaitzeko wifi sareak "
 "erabilgarri daudenean."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Zigilua"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Ezarpenak bertsio berrira migratuko diren edo ez  ezartzeko erabiltzen da."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desgaitu Wi-Fiaren sorrera"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Ezarri hau TRUE (egia) gisa bereziki prestatutako sareen sorrera desgaitzeko "
 "miniaplikazioa erabiltzean."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Erakutsi miniaplikazioa jakinarazpenen arean"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Ezarri FALSE (faltsua) gisa miniaplikazioa jakinarazpenen arean erakustea "
 "desgaitzeko."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ez ikusi egin ZE ziurtagiriri"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -122,7 +133,7 @@ msgstr ""
 "Ezarri TRUE (egia) gisa EAP autentifikazioan ZE ziurtagiriei buruzko abisuak "
 "desgaitzeko."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -130,130 +141,143 @@ msgstr ""
 "Ezarri TRUE (egia) gisa EAP autentifikazioaren 2. urratsean ZE ziurtagiriei "
 "buruzko abisuak desgaitzeko."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Sareko kudeatzailea"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Ez dago sareko konexiorik"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager miniaplikazioa"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X autentifikazioa"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Konektatu"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Sarearen izena:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Huts egin du konexioa gehitzean/aktibatzean"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Konexioaren hutsegitea"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Huts egin du gailua deskonektatzean"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Deskonexioaren hutsegitea"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Konexioaren aktibazioak huts egin du"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ez erakutsi mezu hau berriro"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -263,7 +287,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioa deskonektatu egin da, sareko konexioa eten egin delako."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -273,7 +297,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, sareko konexioa eten egin delako."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +306,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, VPN zerbitzua ustekabean gelditu delako."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -293,7 +317,7 @@ msgstr ""
 "'%s' VPN konexioak huts egin du, VPN zerbitzuak konfigurazio baliogabea "
 "itzuli duelako."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,7 +326,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, konexio-saiakeren denbora iraungitu delako."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -311,7 +335,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, VPN zerbitzua ez delako garaiz hasi."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -321,7 +345,7 @@ msgstr ""
 "'%s' VPN konexioak huts egin du, VPN zerbitzuak huts egin duelako "
 "abiaraztean."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -330,7 +354,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, ez dagoelako baliozko VPN sekreturik."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -339,7 +363,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, ez dagoelako baliozko VPN sekreturik."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -348,7 +372,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -359,19 +383,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPNaren konexioa ongi ezarri da.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN saio-hasierako mezua"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN konexioak huts egin du"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -385,7 +409,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -398,565 +422,590 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "gailua ez dago prest (firmwarea falta da)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "gailua ez dago prest"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "deskonektatuta"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "gailua ez dago kudeatuta"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Ez dago sareko gailurik erabilgarri"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN konexioak"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Konfiguratu VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN konexioak"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager ez da exekutatzen ari..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Sarea desgaituta"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Gaitu _sarea"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Gaitu _wifia"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Gaitu _banda-zabal mugikorra"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Gaitu _jakinarazpenak"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Konexioaren _informazioa"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Editatu konexioak..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "'%s' sarera konektatuta."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Sareko konexioa deskonektatu egin da."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "'%s' sareko konexioa prestatzen..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' sareko konexiorako..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Sareko helbide bat eskatzen '%s' sareari..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "'%s' sareko konexioa aktiboa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "'%s' VPN konexioa hasieratzen..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' VPN konexiorako..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Sareko helbide bat eskatzen VPN '%s' sareari..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "'%s' VPN konexioa aktiboa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ez dago sareko konexiorik"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager miniaplikazioa"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Okerreko PUK kodea. Jar zaitez hornitzailearekin harremanetan."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Okerreko PIN kodea. Jar zaitez hornitzailearekin harremanetan."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Desblokeatzeko kodea bidaltzen..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Bandazabal mugikorra (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Bandazabal mugikorra"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Erabilgarri"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Bandazabal mugikorraren konexio berria"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Konektatuta"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Bandazabal mugikorren sarera konektatuta."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Bandazabal mugikorreko sarea."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Orain etxeko sarera harpidetuta zaude."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Orain sare ibiltarian harpidetuta zaude."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Bandazabal mugikorren sarera konektatuta."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "'%s' banda-zabalera mugikorraren konexioa prestatzen..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "'%s' banda-zabalera mugikorraren konexioa konfiguratzen..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Erabiltzailearen autentifikazioa behar da '%s' banda-zabal mugikorrera "
 "konektatzeko..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "'%s' banda-zabal mugikorraren konexioa aktibo dago"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatikoa"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet sareak (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet sarea (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet sareak"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet sarea"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ethernet sarera konektatuta."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "'%s' ethernet sarearen konexioa prestatzen..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "'%s' ethernet sarearen konexioa konfiguratzen..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Erabiltzailearen autentifikazioa behar da '%s' ethernet sarearen "
 "konexiorako..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ethernet sareko helbide bat eskatzen '%s'(r)entzako ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "'%s' ethernet sarearen konexioa aktibo dago"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikazioa"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Konektatu ezkutuko wifi sarera"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Sortu wifi sare berria"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Ezin izan da konexio berria gehitzean"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wifi sareak (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wifi sarea (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wifi sarea"
 msgstr[1] "Wifi sareak"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wifia desgaituta dago"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Hardwarearen aldatzaileak desgaitu du wifia"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Sare gehiago"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wifi sare erabilgarriak"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Erabili sarearen menua wifi sare batera konektatzeko"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "'%s' wifi sarera konektatuta."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "'%s' wifi sarearen konexioa prestatzen..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "'%s' wifi sarearen konexioa konfiguratzen..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' wifi sarerako..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Wifi sareko helbide bat eskatzen '%s'(r)entzako..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "'%s' wifi sarearen konexioa aktiboa: %s (%%%d)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "'%s' wifi sarearen konexioa aktibo dago"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Huts egin du konexioa aktibatzean"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Errorea konexioaren informazioa bistaratzean:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinamikoa"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Helbideak"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (lehenetsia)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP helbidea"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Difusio-helbidea"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Azpisare-maskara"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Nagusia:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Bigarren mailako DNSa:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Hirugarren mailako DNSa:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi-a (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfazea"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardwarearen helbidea"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Kontrolatzailea"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Abiadura"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Segurtasuna:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Bide lehenetsia"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ez ikusi eginda"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Pasahitza:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN mota"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPNren atebidea"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPNren erabiltzaile-izena"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPNren iragarkia"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Oinarrizko konexioa"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Ez da konexio aktiborik aurkitu."
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -964,17 +1013,21 @@ msgstr ""
 "Copyright-a © 2005-2008 Novell, Inc. eta komunitateko beste laguntzaile eta "
 "itzultzaileak"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Jakinarazpen-areako miniaplikazioa sareko gailuak eta konexioak kudeatzeko."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager-en web gunea"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -982,33 +1035,33 @@ msgstr ""
 "NetworkManager miniaplikazioak ezin izan du behar diren baliabide batzuk "
 "aurkitu (.ui fitxategia ez da aurkitu)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Baliabideak falta dira"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Bandazabal mugikorreko sarearen pasahitza"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Pasahitza behar da '%s'(e)ra konektatzeko."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIMa desblokeatzeko PIN kodea behar da"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIMa desblokeatzeko PIN kodea behar da"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1017,25 +1070,25 @@ msgstr ""
 "'%s' banda-zabaleko gailuak SIMaren PIN kodea behar du erabili ahal izateko."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kodea:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Erakutsi PIN kodea"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIMa desblokeatzeko PUK kodea behar da"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIMa desblokeatzeko PUK kodea behar da"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1044,35 +1097,42 @@ msgstr ""
 "'%s' banda-zabaleko gailuak SIMaren PUK kodea behar du erabili ahal izateko."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kodea:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "PIN kode berria:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Sartu berriro PIN kode berria:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Erakutsi PIN/PUK kodeak"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Konexioaren informazioa"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Huts egin du DUN konexioa sortzean: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1081,41 +1141,41 @@ msgstr ""
 "IP helbideak ordenagailua identifikatzen du sarearen barruan. Egin klik "
 "\"Gehitu\" botoian IP helbide bat gehitzeko."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "E_zabatu"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Ezikusi egin automatikoki lortutako bideei"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Erabili _konexio hau soilik bere sareko baliabideentzako"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1123,16 +1183,16 @@ msgstr ""
 "Gaituta badago, konexio hau ez da inoiz ere erabiliko sareko konexio "
 "lehenetsi gisa."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Sortu..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Aukeratu konexio mota"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1144,85 +1204,100 @@ msgstr ""
 "Sortzea nahi duzun VPN konexio mota ez bada zerrendan agertzen baliteke VPN "
 "plugina ongi instalatuta ez egotea."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Zerbitzua:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktibatu babeskopia"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Igorpena"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Transmisio karga orekatze moldakorra"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Karga orekatze moldakorra"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (gomendatua)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Lotutako _konexioak:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Modua:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Monitorizazioaren _maiztasuna:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Interfazearen izena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Konexioaren monitorizazioa:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _helburuak:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1230,19 +1305,22 @@ msgstr ""
 "IP helbidea , edo komaz bereiztutako IP helbideen zerrenda, konexioaren "
 "egoera egiaztatzean bilatzeko"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Konexioa aktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Konexioa desaktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Nagusia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1250,105 +1328,163 @@ msgstr ""
 "Gailu nagusiaren interfaze-izena. Ezartzen bada, gailu hau beti izango da "
 "morroi aktiboa erabilgarri dagoenean."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "byte"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Bidearen _kostua:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Lehentasuna:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hairpin modua:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Zubi _konexioak:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Birbidalketaren atzerapena:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Hello denbora:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Gaitu _sarea"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Gaitu _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "G_ehien. adina:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Adinaren denbora:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatikoa"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "lehenetsia"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Gaitu"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1359,197 +1495,237 @@ msgstr ""
 "gailuaren hardwarearen helbide gisa. Eginbide hau MAC helbidea klonatzea edo "
 "iruzurtzea bezala ezagutzen da. Adibidez: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Helbidea"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Helbidea"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN interfazearen _izena:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardwarearen helbidea:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Edozein gailu"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Huts egin du konexioaren sekretua eguneratzean errore ezezagun bat dela eta."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Erabili konexio honen DCB (Data Center Bridging)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Fluxu-kontrola"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Eginbidea"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Gaitu"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Argitaratu"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Onespena"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Aukerak..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Lehentasunen taldeak"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabrika"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Lehentasunaren fluxu-kontrola"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Gaitu edo desgaitu lehentasunaren pausaren transmisioa erabiltzailearen "
 "lehentasun bakoitzeko."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Lehentasuna:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Trafikoaren klasea:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Banda-zabalera zorrotza:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Lehentasuneko banda-zabalera:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Taldearen banda-zabalera:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Taldearen IDa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Sartu lehentasunen taldearen IDa erabiltzailearen lehentasun bakoitzeko."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1557,246 +1733,307 @@ msgstr ""
 "Sartu baimendutako estekaren banda-zabaleraren ehunekoa 'Lehentasunaren "
 "taldea' erabil daiteke. Talde guztien batura %100 izan behar du."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Sartu lehentasunen taldearen banda-zabaleraren ehunekoa erabiltzailearen "
 "lehentasuna erabil daiteke."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Gaitu edo desgaitu banda-zabalera zehatza erabiltzailearen lehentasun "
 "bakoitzeko."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Sartu trafikoaren klasea erabiltzailearen lehentasun bakoitzeko."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Erabiltzaile-_izena:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Zerbitzua:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Erakutsi _pasahitza"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Pasahitza:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfazea"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfaze _gurasoa:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfaze _gurasoa:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Pare bihurritua (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Interfaze-unitate erantsia (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Euskarri independenteen interfazea (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ez ikusi egin"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Eskuz"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Ataka:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Zerbitzua:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Klonatutako MAC helbidea:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Gako pribatuaren pasahitza:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Lehenetsia"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ez ikusi egin"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Igorpena"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Gako pribatuaren pasahitza:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "Abia_dura:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Erabateko _duplexa"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Konektatu automatikoki _VPNra konexio hau erabiltzean"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Bai"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Ez"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "_Erabiltzaile guztiak konekta daitezke sare honetara"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Konektatu _automatikoki sare honetara erabilgarri dagoenean"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Konektatu automatikoki _VPNra konexio hau erabiltzean"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Konexioaren _informazioa"
+msgid "Firewall _zone"
+msgstr "Suebakiaren _zona:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Taldearen konexioak:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Konektatu _automatikoki"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "Suebakiaren _zona:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1805,7 +2042,7 @@ msgstr ""
 "IP helbideak ordenagailua identifikatzen du sarearen barruan. Egin klik "
 "\"Gehitu\" botoian IP helbide bat gehitzeko."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1813,128 +2050,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatikoa, helbideak soilik"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Helbideak"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Garraioaren modua:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Garraioaren modua:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Gailuaren izena + zenbakia"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Modua:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatikoa DNSren eskuzko ezarpenekin"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Esteka lokalak"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Beste ordenagailuekin partekatua"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metodoa:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1945,8 +2186,8 @@ msgstr ""
 "konfigurazioa pertsonalizatzea eskaintzen dio. DHCP bezero baten "
 "identifikatzailea erabiltzea nahi baduzu, sartu hemen."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1954,25 +2195,26 @@ msgstr ""
 "Ostalari-izenak ebaztean erabiliko den domeinua. Erabili komak hainbat "
 "domeinu bereizteko."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP bezeroaren IDa:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Bilaketako domeinuak:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS zerbitzariak:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1980,11 +2222,11 @@ msgstr ""
 "Domeinuen izenen zerbitzarien IP helbideak ostalari-izenak ebazteko.  "
 "Erabili komak hainbat DNS helbide bereizteko."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4 helbide mota behar da konexio hau osatzeko"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1992,25 +2234,35 @@ msgstr ""
 "IPv6 gaitasuneko sareekin konektatzean, konexioa osatzea baimentzen du IPv4 "
 "konfigurazioak huts egiten badu baina IPv6 konfigurazioa ongi lantzen denean."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Bideak..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desgaituta"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Gaituta (helbide publikoa hobetsita)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Gaituta (aldi baterako helbidea hobetsita)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Gaitu"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2020,15 +2272,20 @@ msgstr ""
 "Erabili komak hainbat DNS helbide bereizteko. Konexio lokalaren helbidea "
 "esparruan automatikoki sartuko da konexioaren interfazera."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6 _pribatutasunaren hedapenak:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6 helbide mota behar da konexio hau osatzeko"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2036,755 +2293,862 @@ msgstr ""
 "IPv4 gaitasuneko sareekin konektatzean, konexioa osatzea baimentzen du IPv6 "
 "konfigurazioak huts egiten badu baina IPv4 konfigurazioa ongi lantzen denean."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrika"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Inportatu"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Zenbakia:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_Sareko IDa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Aldatu..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "_PINa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Baimendu '_ibiltaritza' etxeko sarea ez badago erabilgarri"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Erakutsi _pasahitzak"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Baimendutako metodoak:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfiguratu _metodoak..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Konpresioa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Erabili puntutik punturako enkriptazioa (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_128 bit-eko enkriptazioa behar da"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Erabili MPPE _egoerarekin"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Baimendu _BSD datu-konpresioa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Baimendu _Deflate datu-konpresioa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Erabili TCP _goiburu-konpresioa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Oihartzuna"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Bidali PPP _echo paketeak"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Metodoa:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Inportatu taldearen konfigurazioa fitxategitik..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metodoa:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Aurreratua"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet sareak"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Lehentasuna:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Lehentasuna:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Lehentasuna:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_Gako pribatua:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Konexioa aktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Konexioa desaktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interfaze _gurasoa:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _helburuak:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _helburuak:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Inportatu taldearen konfigurazioa fitxategitik..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_JSON konfigurazioa:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Taldearen banda-zabalera:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Lehentasuna"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Taldearen konexioak:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Hardwarearen helbidea:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Hardwarearen helbidea:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Lehentasuna:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Transmisio-indarra:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Transmisio-indarra:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Interfaze _gurasoa:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN interfazearen _izena:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Klonatutako MAC helbidea:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLANaren _IDa:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Gailuaren izena + zenbakia"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + zenbakia"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Segurtasuna:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Transmisio-indarra:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Tasa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanala:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Banda:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Baimendutako autentifikazio metodoak"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Autentifikazio protokolo hedagarria"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Pasahitzaren autentifikazioa protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "_CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft-en Challenge Handshake Authentication protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft-en Challenge Handshake Authentication protokoloa 2. bertsioa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2794,111 +3158,99 @@ msgstr ""
 "guztiak onartzen dituzte. Konexioak huts egiten badu, saiatu metodo "
 "batzuentzako euskarria desgaituz."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wifia"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Lotu"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Taldea"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Zubia"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN pluginak huts egin du VPN konexioa zuzen inportatzean\n"
-"\n"
-"Errorea: ez da VPN zerbitzu mota."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Ezin da VPN konexioa inportatu"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Ezin izan da '%s' fitxategia irakurri, edo ez dauka VPN konexioaren "
-"informazio ezagunik.\n"
+"VPN pluginak huts egin du VPN konexioa zuzen inportatzean\n"
 "\n"
-"Errorea: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Errore ezezaguna"
+"Errorea: ez da VPN zerbitzu mota."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Hautatu fitxategia inportatzeko"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Birtuala"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Inportatu gordetako VPNaren konfigurazioa..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2906,79 +3258,86 @@ msgstr ""
 "Ezin izan da konexioaren editorearen elkarrizketa-koadroa hasieratu errore "
 "ezezagun bat gertatu delako."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Ezin izan da konexio berria sortu"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Huts egin du konexioa ezabatzean"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ziur zaude %s konexioa ezabatu nahi duzula?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN konexioak"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Helbidea"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Sare-maskara"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Atebidea"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Aurrizkia"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s editatzen"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Izenik gabeko konexioa editatzea"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Konexioaren _izena:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Errorea editorea hasieratzean"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Konexioa gehitzean huts egin du"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2986,55 +3345,52 @@ msgstr ""
 "Konexioen editoreak ezin izan du beharrezko baliabide batzuk aurkitu (.ui "
 "fitxategia ez da aurkitu)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Gorde konexio honetan egindako edozer aldaketa."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentifikatu konexio hau gordetzeko ordenagailuko erabiltzaile guztientzako."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Ezin izan da konexioa sortu"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ezin izan da konexioa editatu"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Errore ezezaguna konexioaren editorearen elkarrizketa-koadroa sortzean."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Errorea editorea hasieratzean"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Konexioa gehitzean huts egin du"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3043,201 +3399,247 @@ msgstr ""
 "Ezarri TRUE (egia) gisa EAP autentifikazioan ZE ziurtagiriei buruzko abisuak "
 "desgaitzeko."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Konexioaren _izena:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_sportatu..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "etiketa"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "etiketa"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "inoiz ez"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "orain"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "duela minutu %d"
 msgstr[1] "duela %d minutu"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "duela ordu %d"
 msgstr[1] "duela %d ordu"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "duela egun %d"
 msgstr[1] "duela %d egun"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "duela hilabete %d"
 msgstr[1] "duela %d hilabete"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "duela urte %d"
 msgstr[1] "duela %d urte"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Konexioa gehitzean huts egin du"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "%d talde-konexioa"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "%d talde-konexioa"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Erabilitako azkena"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Editatu hautatutako konexioa"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentifikatu hautatutako konexioa editatzeko"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Ezabatu hautatutako konexioa"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentifikatu hautatutako konexioa ezabatzeko"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Bandazabalera mugikorraren konexio mota onartu gabea."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ez daki nola sortu '%s' konexioak"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Errorea konexioa editatzean"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Errorea konexioa sortzean."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Konexioa gehitzean huts egin du"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Ez dago VPN pluginik instalatuta."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ez daki nola sortu '%s' konexioak"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Errorea konexioa editatzean"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Ez da konexiorik aurkitu '%s' UUIDrekin"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Sareko konexioak"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN konexioak"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X segurtasuna"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Ezin izan da 802.1X segurtasunerako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Erabili 802.1_X segurtasuna konexio honetan"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Ezin izan da Bluetoohth erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ezin izan da Bluetooth gailua aurkitu."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Loturen %d konexio"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet sarea"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wifi sarea"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Ezin izan da loturaren interfazea kargatu."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Nagusia:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Loturen %d konexio"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Ezin izan da zubiaren erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Zubien %d konexio"
@@ -3245,32 +3647,37 @@ msgstr "Zubien %d konexio"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Zubiaren ataka"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Ezin izan da zubiaren atakaren erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Ezin izan da DCB erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Ezin izan da DSLrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfaze _gurasoa:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSLen %d konexio"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3280,44 +3687,43 @@ msgstr ""
 "Aukera honek sareko gailuaren konexioa blokeatzen du hemen sartutako bere "
 "betirako MAC helbideak zehaztuta. Adibidez: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ez ikusi eginda"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ezin izan da ethernet erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Klonatutako MAC helbidea:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Etherneten %d konexio"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3327,11 +3733,11 @@ msgstr ""
 "arrunt bat, hau hautatzean suebakian ezarritako zona lehenetsia erabiltzea "
 "dakar. Soilik erabilgarria 'firewalld' aktibo dagoenean."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Ezin izan da erabiltzailearen interfaze nagusia kargatu."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3342,158 +3748,162 @@ msgstr ""
 "Aukera honek sareko gailuaren konexioa blokeatzen du hemen sartutako bere "
 "betirako MAC helbideak zehaztuta. Adibidez: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Ezin izan da InfiniBand-en erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBanden %d konexio"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Ezin izan da IPv4rentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Etherneten %d konexio"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatikoa (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Helbide automatikoak soilik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatikoa, helbideak soilik"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatikoa (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Helbide automatikoak soilik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatikoa (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Helbide automatikoak soilik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Esteka lokalak soilik"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "DNS _zerbitzari gehigarriak:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "_Bilaketako domeinu gehigarriak:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "'%s'(r)en IPv4 bideak editatzea"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 ezarpenak"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Ezin izan da IPv4rentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatikoa (DHCP soilik)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "'%s'(r)en IPv6 bideak editatzea"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 ezarpenak"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Ezin izan da IPv6rentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Ezin izan da WiMAXarentzako erabiltzailearen interfazea kargatu."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAXen %d konexio"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Bikoiztu morroiak"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "'%s' eta '%s' morroiak '%s' gailuari aplikatuko zaizkio"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3502,26 +3912,26 @@ msgstr ""
 "'%s' eta '%s' morroiak gailu fisiko berdineko ataka birtual desberdinei "
 "aplikatuko zaizkie ('%s' eta '%s')."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s(r)en %d. morroia"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Ezin izan da banda-zabal mugikorrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Bandazabalera mugikorraren konexio mota onartu gabea."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Hautatu banda-zabal mugikorraren hornitzaile mota"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3530,7 +3940,7 @@ msgstr ""
 "Hautatu banda-zabal mugikorraren hornitzaileak erabiltzen duen teknologia. "
 "Ez bazaude ziur, galdetu hornitzaileari."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Hornitzaileak _GSMen oinarritutako teknologia darabil (adib. GPRS, EDGE, "
@@ -3538,85 +3948,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Hornitzaileak C_DMAn oinarritutako teknologia darabil (adib. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "bat ere ez"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "'%s'(r)en PPP autentifikazio metodoak editatzea"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ezarpenak"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Ezin izan da PPPrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Ezin izan da loturaren interfazea kargatu."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Errorea: fitxategiak ez dauka baliozko JSON konfigurazioa"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Ezin izan da taldearen UIa kargatu."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "%d talde-konexioa"
@@ -3624,69 +4030,69 @@ msgstr "%d talde-konexioa"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Taldearen ataka"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Ezin izan da taldearen atakaren erabiltzailearen interfazea kargatu."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s ('%s' bidez)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Ez dago sareko konexiorik"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Ezin izan da VLANarentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLANen %d konexio"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Ezin izan da VPNren interfazea kargatu."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Ezin izan da VPN pluginaren zerbitzurik aurkitu '%s'(r)entzako."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Ezin izan da VPN pluginaren zerbitzurik aurkitu '%s'(r)entzako."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Konexioaren hutsegitea"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Ezin izan da VPNren interfazea kargatu."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Ezin izan da VPN pluginaren zerbitzurik aurkitu '%s'(r)entzako."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPNen %d konexio"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Aukeratu VPN konexio mota"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3697,7 +4103,7 @@ msgstr ""
 "VPN konexio mota ez bada zerrendan agertzen baliteke VPN plugina ongi "
 "instalatuta ez egotea."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3706,7 +4112,7 @@ msgstr ""
 "Aukera honek wifi sareko sarbidetza puntuaren (AP) konexioa blokeatzen du "
 "hemen sartutako BSSIDek zehaztuta. Adibidez: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3716,97 +4122,95 @@ msgstr ""
 "Aukera honek sareko gailuaren konexioa blokeatzen du hemen sartutako bere "
 "betirako MAC helbideak zehaztuta. Adibidez: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ezin izan da Wi-Fiarentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Edozein gailu"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wifien %d konexio"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bit-eko gakoa (hamaseitarra edo ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bit-eko pasaesaldia"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamikoa (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA eta WPA2 pertsonala"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA eta WPA2 enpresa"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Ezin izan da wifiaren segurtasunerako erabiltzailearen interfazea kargatu. "
 "Wifiaren ezarpenak falta dira."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wifiaren segurtasuna"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Ezin izan da wifiaren segurtasunerako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" izeneko fitxategia badago lehendik ere."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Nahi duzu gordetzen ari zaren VPN konexioarekin '%s' ordeztea?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Ezin da VPN konexioa esportatu"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3817,222 +4221,106 @@ msgstr ""
 "\n"
 "Errorea: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Esportatu VPN konexioa..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desblokeatu"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Desblokeatu automatikoki gailu hau"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Konexioaren informazioa"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktibatu sareko konexioak"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ez da ZE ziurtagiririk _behar"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Aukeratu ZE ziurtagiria"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Gako pribatua:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Gako pribatuaren pasahitza:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Aukeratu ZE ziurtagiria"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Erabiltzailearen _ziurtagiria:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Bandazabal mugikorraren konexioa honako ezarpenekin konfiguratu da:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Gailua:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Hornitzailea:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Plana:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Hautatutako ezarpenekin banda-zabal mugikorraren hornitzailearekin konexioa "
-"egin daiteke. Konexioak huts egiten badu, edo ezin baduzu sareko "
-"baliabideetara sarbidetu, begiratu itzazu ezarpenak. Bandazabal mugikorreko "
-"konexioaren ezarpenak aldatzeko, aukeratu Sistema >> Hobespenak menuko "
-"\"Sareko konexioak\" elementua."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Berretsi banda-zabal mugikorraren ezarpenak"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Nire herrialdea ez dago zerrendatuta"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Zerrendatu gabea"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Hautatu zure plana:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Hautatu _APL (sarbidetzeko puntuaren izena) plana:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Abisua: okerreko plan bat hautatzeak zure banda-zabaleraren kontuaren "
-"fakturan arazoak eragin lezake, edo ezin konektatu izatea.\n"
-"\n"
-"Ez bazaude ziur planari buruz, galdetu ezaiozu hornitzaileari planaren "
-"APLari buruz."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Aukeratu prezioen plana"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Nire plana ez dago zerrendatuta..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Hautatu hornitzailea _zerrendatik:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Hornitzailea"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Hornitzailea:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Hornitzaileak GSM teknologia darabil (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Hornitzaileak CDMA teknologia darabil (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Aukeratu hornitzailea"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Herrialde edo eskualdearen zerrenda:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Herrialde edo eskualdea"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Nire herrialdea ez dago zerrendatuta"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Aukeratu hornitzailearen herrialde edo eskualdea"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instalatutako GSM gailua"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instalatutako CDMA gailua"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Edozein gailu"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Bandazabal mugikorraren konexio berria"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4040,224 +4328,303 @@ msgstr ""
 "Morroi honek banda-zabal mugikorraren konexioa mugikorren sarera (3G) "
 "konfiguratzen lagunduko dizu."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Honako informazioa beharko duzu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Bandazabalaren hornitzailearen izena"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Bandazabaleko prezioen planaren izena"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(zenbait kasutan) banda-zabalaren APN prezioen plana"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Sortu konexio bat banda-zabal mugikor gailu _honentzako:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Edozein gailu"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Konfiguratu banda-zabal mugikorraren konexioa"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Bandazabal mugikorraren konexio berria"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Herrialde edo eskualdea"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Aukeratu hornitzailearen herrialde edo eskualdea"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Hautatu hornitzailea _zerrendatik:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Hornitzaileak GSM teknologia darabil (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Hornitzaileak CDMA teknologia darabil (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Aukeratu hornitzailea"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Hautatu zure plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Hautatu _APL (sarbidetzeko puntuaren izena) plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Abisua: okerreko plan bat hautatzeak zure banda-zabaleraren kontuaren "
+"fakturan arazoak eragin lezake, edo ezin konektatu izatea.\n"
+"\n"
+"Ez bazaude ziur planari buruz, galdetu ezaiozu hornitzaileari planaren "
+"APLari buruz."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Aukeratu prezioen plana"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Bandazabal mugikorraren konexioa honako ezarpenekin konfiguratu da:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Gailua:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Hornitzailea:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Plana:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Hautatutako ezarpenekin banda-zabal mugikorraren hornitzailearekin konexioa "
+"egin daiteke. Konexioak huts egiten badu, edo ezin baduzu sareko "
+"baliabideetara sarbidetu, begiratu itzazu ezarpenak. Bandazabal mugikorreko "
+"konexioaren ezarpenak aldatzeko, aukeratu Sistema >> Hobespenak menuko "
+"\"Sareko konexioak\" elementua."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Berretsi banda-zabal mugikorraren ezarpenak"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "_ZE ziurtagiria:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ezezaguna"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Aukeratu ZE ziurtagiria"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Erabiltzailearen _ziurtagiria:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Errorea konexioa editatzean"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Desblokeatu"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Gorde pasahitza soilik erabiltzaile _honentzako"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Gorde pasahitza erabiltzaile _guztientzako"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Eskatu pasahitz hau aldiro"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Pasahitza behar da '%s'(e)ra konektatzeko."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Bigarren pasahitza:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Erakutsi _pasahitzak"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Bigarren pasahitza:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Erakutsi _pasahitzak"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Bigarren pasahitza:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Pasahitza:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Deskonektatu"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamikoa (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Sortu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Pasahitzak edo enkriptatze-gakoak behar dira '%s' wifi sarera sarbidetzeko."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi sarearen autentifikazioa beharrezkoa"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi sareak autentifikazioa eskatzen du"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Sortu wifi sare berria"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Wifi sare berria"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Sartu wifi sarearen izena sortzeko."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektatu ezkutuko wifi sarera"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Ezkutuko wifi sarea"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4265,35 +4632,55 @@ msgstr ""
 "Sartu konektatzea nahi duzun ezkutuko wifi sarearen izena eta segurtasuneko "
 "xehetasunak."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Wifiaren segurtasuna:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Konexioa:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wifiaren _moldagailua:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Hornitzailea:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Herrialde edo eskualdearen zerrenda:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Herrialde edo eskualdea"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Hariduna"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC maila"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4303,17 +4690,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "[%s] %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Wifiaren segurtasuna:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Sarearen izena:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Konexioa:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wifiaren _moldagailua:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4321,7 +4730,7 @@ msgstr ""
 "Programa hau NetworkManager-ren osagai bat da (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4329,412 +4738,481 @@ msgstr ""
 "Ez du komando-lerroan elkarreragiteko helbururik, baizik eta GNOME "
 "mahaigaineko ingurunean exekutatzea da bere helburua."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ez dago gaituta"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "erregistratu gabe"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Etxeko sarea (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Etxeko sarea"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "bilatzen"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "erregistratzea ukatuta"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ibiltaritza)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ibiltaritza)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ibiltaritza sarea (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Ibiltaritza sarea"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%s' SIM txartelaren PIN kodea '%s'(e)n"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN kodea behar da"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN kodea behar da banda-zabal mugikorreko gailuarentzako"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' banda-zabal mugikorraren konexioa aktibo dago: (%% %d%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ibiltaritza"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s konexioa"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER edo PEM ziurtagiriak (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, edo PKCS#12 gako pribatuak (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ez da ZE ziurtagiririk _behar"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Aukeratu PAC fitxategia..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC fitxategiak (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimoa"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentifikatuta"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Biak"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Nortasun _anonimoa:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _fitxategia:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Barneko autentifikazioa:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Baimendu PAC automatikoa _aldi baterako"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "0 bertsioa"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "1 bertsioa"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "_ZE ziurtagiria:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Ez da ZE ziurtagiririk _behar"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _bertsioa:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 bit-eko pasaesaldia"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Erakutsi _pasahitzak"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ez da ZE ziurtagiririk _behar"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ez da ZE ziurtagiririk _behar"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Identitatea:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "Bizkorra"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tuneldun TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Babestutako EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Autentifikazioa:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (lehenetsia)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema irekia"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Partekatutako gakoa"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (lehenetsia)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Gakoa:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "E_rakutsi gakoa"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP _indizea:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Mota:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (lehenetsia)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ez ikusi eginda"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Huts egin du konexioaren sekretua eguneratzean errore ezezagun bat dela "
+#~ "eta."
+
+#~ msgid "Priority:"
+#~ msgstr "Lehentasuna:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Konektatu _automatikoki sare honetara erabilgarri dagoenean"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Konexioaren _informazioa"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Ezin da VPN konexioa inportatu"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Ezin izan da '%s' fitxategia irakurri, edo ez dauka VPN konexioaren "
+#~ "informazio ezagunik.\n"
+#~ "\n"
+#~ "Errorea: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Errore ezezaguna"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "_ZE ziurtagiria:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Sareko kudeatzailea"
@@ -4768,30 +5246,6 @@ msgstr "_Mota:"
 #~ 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"
 
@@ -5024,12 +5478,6 @@ msgstr "_Mota:"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "'%s' / '%s' propietatea baliogabea da: %d"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Ezin izan da WiMAXarentzako erabiltzailearen interfazea kargatu."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAXen %d konexio"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5052,9 +5500,6 @@ msgstr "_Mota:"
 #~ msgid "Error: %s"
 #~ msgstr "Errorea: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Huts egin du DUN konexioa sortzean: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefonoa prest dago erabiltzeko."
 
@@ -5092,21 +5537,9 @@ msgstr "_Mota:"
 #~ msgid "%s Network"
 #~ msgstr "%s sarea"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Bigarren mailako DNSa:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Hirugarren mailako DNSa:"
-
-#~ msgid "Yes"
-#~ msgstr "Bai"
-
 #~ msgid "Only on activation"
 #~ msgstr "Soilik aktibatzean"
 
-#~ msgid "No"
-#~ msgstr "Ez"
-
 #~ msgid "Carrier de_tect:"
 #~ msgstr "Garraiatzailearen _detekzioa:"
 
@@ -5185,12 +5618,6 @@ msgstr "_Mota:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Erabiltzaile guztientzako erabilgarri"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Konektatu _automatikoki"
-
-#~ msgid "_Import"
-#~ msgstr "_Inportatu"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "Errore ezezagun bat gertatu da."
 
diff --git a/po/fa.po b/po/fa.po
index c104a6cd..ad39c891 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-10-12 20:48+0330\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian\n"
@@ -20,48 +21,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "شبکه"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "اتصال‌های شبکه خود را مدیریت کنید"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "اتصال‌های شبکه"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "اتصال‌های فعال شبکه"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "تنظیمات اتصال شبکه خود را مدیریت و تغییر دهید"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "غیرفعال‌سازی اعلان‌های برقراری ارتباط"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها هنگام ارتباط با یک شبکه این قسمت را True تنظیم کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "غیرفعال‌سازی اعلان‌های قطع ارتباط"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط از یک شبکه بر روی true تنظیم "
 "کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "غیرفعال‌سازی اعلان‌های وی‌پی‌ان"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -69,11 +79,11 @@ msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها در زمان قطع ارتباط یا اتصال به وی‌پی‌ان این قسمت را "
 "True تنظیم کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "متوقف کردن اعلان‌های موجود شبکه‌ها"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -81,40 +91,41 @@ msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها در زمانی که شبکه‌های بی‌سیم در دسترس هستند این قسمت "
 "را True تنظیم کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "تمبر"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "جهت تشخیص اینکه آیا تنظیمات باید به نسخه جدید انتقال پیدا کنند یا خیر مورد "
 "استفاده قرار می‌گیرد."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "غیرفعال‌سازی ساخت وای‌فای"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "برای غیرفعال کردن شبکه‌های ادهاک زمانی که از برنامک استفاده می‌کنید گزینه True "
 "را انتخاب کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -122,7 +133,7 @@ msgstr ""
 "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت EAP برروی "
 "true تنظیم کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -130,131 +141,144 @@ msgstr ""
 "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت فاز ۲ از "
 "EAP برروی true تنظیم کنید."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "برنامک مدیریت شبکه"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "هیچ اتصال شبکه وجود ندارد"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "برنامک مدیریت شبکه"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "تصدیق هویت ۸۰۲.۱x کابلی"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_اتصال"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "نام _شبکه:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "ادهاک"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "اضافه/فعال کردن اتصال شکست خورد"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "خطا ناشناس"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "اتصال شکست خورد"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "قطع ارتباط دستگاه شکست خورد"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "شکست قطع ارتباط"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "فعال‌سازی اتصال شکست خورد"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "این پیغام را دیگر نمایش نده"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -264,7 +288,7 @@ msgstr ""
 "\n"
 "اتصال به شبکه وی‌پی‌ان «%s» شکست خورد، چون اتصال شبکه قطع شده است."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -274,7 +298,7 @@ msgstr ""
 "\n"
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اتصال شبکه قطع شده است."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -284,7 +308,7 @@ msgstr ""
 "اتصال شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به طور غیر "
 "منتظره متوقف شد."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +319,7 @@ msgstr ""
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی تنظیمات "
 "اشتباهی برگردانده است."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون زمان تلاش برای برقراری ارتباط "
 "به پایان رسیده است."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +339,7 @@ msgstr ""
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به موقع "
 "اجرا نشد."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اجرا سرویس شبکه خصوصی مجازی "
 "شکست خورد."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز درستی وجود ندارد."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز استباه است."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -352,7 +376,7 @@ msgstr ""
 "\n"
 "اتصال شبکه خصوصی مجازی «%s» شکست خورد."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -363,19 +387,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "اتصال وی‌پی‌ان موفقیت‌آمیز بود.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "پیام ورودی به شبکه مجازی خصوصی"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "اتصال شبکه خصوصی مجازی شکست خورد"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -389,7 +413,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -402,573 +426,598 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "دستگاه آماده نیست (میان‌افراز وجود ندارد)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "دستگاه آماده نیست"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "قطع شد"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ارتباط قطع شده"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "دستگاه مدیریت نشده"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "هیچ دستگاه شبکه‌ای موجود نیست"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_پیکربندی شبکه خصوصی مجازی"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "مدیر شبکه در حال اجرا نیست..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "شبکه غیر فعال شد"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "فعال‌سازی _شبکه"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "فعال‌سازی _بی‌سیم"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "فعال‌سازی پهن‌باند تلفن _همراه"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "فعال سازی ا_علان‌ها"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_اطلاعات اتصال"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "ویرایش ارتباط‌ها..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_درباره"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "هم‌اکنون شما به «%s» متصل شده‌اید."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ارتباط قطع شد"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "اتصال شبکه قطع شده است."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "آماده‌سازی ارتباط شبکه «%s»..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "تصدیق هویت کاربر جهت اتصال به «%s» مورد نیاز است..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "درخواست یک آدرس شبکه برای «%s»..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ارتباط شبکه «%s» فعال شد"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "درحال شروع ارتباط شبکه خصوصی مجازی «%s»..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "برای ارتباط شبکه خصوصی مجازی «%s» به تصدیق هویت نیاز است..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "درحال درخواست یک آدرس شبکه اختصاصی شخصی برای «%s»..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "ارتباط شبکه خصوصی مجازی «%s» فعال شد"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "هیچ اتصال شبکه وجود ندارد"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "برنامک مدیریت شبکه"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "کد PUK اشتباه است؛ لطفا با ارائه‌دهنده خود تماس بگیرید."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "پین‌کد اشتباه است؛ لطفا با ارائه‌دهنده خود تماس بگیرید."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "درحال ارسال کد باز کردن قفل..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "شبکه پهن‌باند تلفن همراه (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "پهن‌باند تلفن همراه"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "در دسترس"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "اتصال برقرار شد"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "شما در حال حاضر به شبکه پهن‌باند تلفن همراه متصل شده‌اید."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "کلمه عبور شبکه پهن‌باند تلفن همراه"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "شما هم‌اکنون در شبکه خانگی ثبت شده‌اید."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "شما هم‌اکنون در شبکه رومینگ ثبت شده‌اید"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "شما در حال حاضر به شبکه پهن‌باند تلفن همراه متصل شده‌اید."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "آماده‌سازی اتصال پهن‌باند تلفن همراه «%s»..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "پیکربندی اتصال پهن‌باند تلفن همراه «%s»..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "تأیید هویت مورد نیاز برای اتصال موبایل پهن‌باند «%s»..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ارتباط شبکه پهن‌باند موبایل «%s» فعال شد"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "اترنت خودکار"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "شبکه‌های سیمی"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "شبکه سیمی"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "شما اکنون به شبکه سیمی متصل شده‌اید"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "آماده‌سازی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "پیکربندی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "برای شبکه سیمی «%s» تایید هویت نیاز است..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "درخواست یک آدرس شبکه برای «%s»..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "اتصال شبکه سیمی «%s» فعال شد"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "تصدیق هویت دی‌اس‌ال"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "اتصال به شبکه بی‌سیم مخفی "
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "ساخت یک شبکه بی‌سیم جدید"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(هیچکدام)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "اضافه کردن اتصال جدید شکست خورد"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "شبکه سیمی"
 msgstr[1] "شبکه سیمی"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "وایمکس غیر فعال است"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "وایمکس توسط سوییچ سخت افزاری غیرفعال است"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "شبکه‌های بیشتر"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "شبکه‌های بی‌سیم در دسترس است"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "برای ارتباط به یک شبکه بی‌سیم از منوی شبکه استفاده کنید"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "شما در حال حاظر به شبکه «%s» متصل شده‌اید."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "آماده‌سازی ارتباط شبکه «%s»..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "پیکربندی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "شبکه بی‌سیم  «%s» به تایید هویت نیاز دارد..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "درخواست یک آدرس شبکه برای «%s»..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "ارتباط با شبکه بی‌سیم «%s» فعال شد: %s (٪%Id)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "اتصال شبکه سیمی «%s» فعال شد"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "فعال‌سازی اتصال شکست خورد"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "خطا در هنگام نمایش اطلاعات اتصال:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "وپ پویا"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "آدرس‌ها"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "وپ"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "هیچکدام"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (پیش‌فرض)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%Iu مگابایت/ثانیه"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ناشناس"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ناشناس"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "آدرس آی‌پی:‌"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "آدرس انتشار"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "نقاب زیرشبکه"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "دی‌ان‌اس اصلی:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "دی‌ان‌اس دوم:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "دی‌ان‌اس سوم:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "اترنت (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "عمومی"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "واسط"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "آدرس سخت‌افزار"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "راه انداز"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "سرعت"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "امنیت: "
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "مسیر پیش‌فرض"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "رد شد"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "گذرواژه:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "نوع وی‌پی‌ان"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "دروازه وی‌پی‌ان"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "نام کاربری وی‌پی‌ان"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "نشان وی‌پی‌ان"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ارتباط پایه"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ناشناس"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "هیچ اتصال فعالی پیدا نشد!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -976,16 +1025,20 @@ msgstr ""
 "حق رونوشت © ۲۰۰۵-۲۰۰۸ شرکت نُوِل. \n"
 "و بسیاری از مشارکت‌کنندگان و مترجمان دیگر"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "برنامک ناحیه اعلان جهت مدیریت دستگاه‌ها و اتصال‌های شبکه."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "پایگاه وب مدیر شبکه"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -993,33 +1046,33 @@ msgstr ""
 "برنامه مدیریت شبکه نمی‌تواند تعدادی از منابع لازم را پیدا کند (پرونده ui پیدا "
 "نشد)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "منابع از دست رفته"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "کلمه عبور شبکه پهن‌باند تلفن همراه"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "برای اتصال با «%s» به کلمه عبور نیاز دارید."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "پین SIM به بازکردن قفل نیاز دارد"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "پین SIM به بازکردن قفل نیاز دارد"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1029,25 +1082,25 @@ msgstr ""
 "به کد پین SIM نیاز دارد."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "کد پین:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "نمایش کد پین"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "به بازکردن قفل SIM PUK نیاز است"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "به بازکردن قفل SIM PUK نیاز است"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1057,35 +1110,42 @@ msgstr ""
 "به کد SIM PUK نیاز دارد."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "کد PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "کد پین جدید:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "کد پین جدید را مجدد وارد کنید:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "کدهای پین/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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "اطلاعات اتصال"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "ساخت اتصال DUN شکست خورد: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1094,57 +1154,57 @@ msgstr ""
 "آدرس‌های آی‌پی شما را بر روی شبکه مشخص میکنند.  برای اضافه کردن یک آدرس آی‌پی، "
 "بر روی دکمه‌ی «افزودن» کلیک کنید."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_حذف"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_نادیده‌گرفتن خودکار مسیرهای دریافت شده"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_استفاده از این ا_تصال تنها برای منابع‌ش بر روی این شبکه"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "اگر فعال باشد، این اتصال هیچ‌وقت به عنوان اتصال شبکه پیش‌فرض نخواهد بود."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "ایجاد..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "نوع شبکه خصوصی مجازی (VPN) را انتخاب کنید"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1156,213 +1216,273 @@ msgstr ""
 "کنید. اگر نوع اتصالی که می خواهید بسازید در لیست وجود ندارد، ممکن است افزونه "
 "صحیح شبکه خصوصی مجازی را نصب ندارید."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_خدمات:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "آدرس انتشار:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "ارتباط پایه:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_نوع:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "واسط:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "دی‌ان‌اس اصلی:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "بایت"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "ارتباط پایه:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "فعال‌سازی _شبکه"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "خودکار"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "پیش‌فرض"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1373,437 +1493,530 @@ msgstr ""
 "اتصال بر روی آن فعال شده است استفاده می‌گردد.  این امکان بعنوان MAC cloning "
 "یا spoofing شناخته می‌شود. مثال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "آدرس"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "آدرس"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "آدرس سخت‌افزار:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "هر دستگاهی"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "بروزرسانی رمز اتصال‌ها به دلیل یک خطای ناشناس شکست خورد."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "از امنیت 802.1_X برای این ارتباط استفاده شود"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "۲"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "۳"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "۴"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_نام کاربری:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_خدمات:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_نمایش گذرواٰژه"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_گذرواژه:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "واسط"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "واسط:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "واسط:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "۱۰ مگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "۱۰۰ مگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "۱ گیگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "۱۰ گیگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "رد کردن"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "دستی"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_درگاه:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_خدمات:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "آدرس مک _کلون شده:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "گذرواژه کلید _خصوصی:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "پیش‌فرض"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "رد کردن"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "آدرس انتشار:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "گذرواژه کلید _خصوصی:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_سرعت:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "کاملا duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "هیچکدام"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "شما اکنون به شبکه سیمی متصل شده‌اید"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "بطور خودکار این دستگاه را باز کن"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_اطلاعات اتصال"
+msgid "_Metered connection"
+msgstr "ارتباط پایه:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "اتصال _خودکار"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1812,7 +2025,7 @@ msgstr ""
 "آدرس‌های آی‌پی شما را بر روی شبکه مشخص میکنند.  برای اضافه کردن یک آدرس آی‌پی، "
 "بر روی دکمه‌ی «افزودن» کلیک کنید."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1820,128 +2033,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "خودکار، فقط آدرس‌ها"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "آدرس‌ها"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_اتصال"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_خدمات:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "اترنت (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "خودکار با تنظیمات دی ان اس دستی"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "پیوند محلی"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "با رایانه‌های دیگر به اشتراک گذاشته شد"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_روش:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1952,8 +2168,8 @@ msgstr ""
 "را سفارشی کند.  اگر تمایل دارید که از شناساگرِ کارگیرِ DHCP استفاده کنید، آن "
 "را اینجا وارد کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1961,25 +2177,26 @@ msgstr ""
 "دامنه‌های استفاده شده هنگام تحلیل نام میزبان. برای جدا کردن چند دامنه از کاما "
 "استفاده کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "_شناسه DHCP کارگیر:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_جستجوی دامنه‌ها:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "کارگزارهای _دی‌ان‌اس:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1987,11 +2204,11 @@ msgstr ""
 "آدرس‌های آی‌پی کارگزارهای نام دامنه استفاده شده جهت تشخصی نام میزبان‌ها. از "
 "کاما برای جدا کردن آدرس‌های کارگزارهای نام دامنه استفاده کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "به آدرس‌دهی آی‌پی ن_سخه ۴ برای تکمیل این اتصال نیاز است"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1999,25 +2216,34 @@ msgstr ""
 "در هنگام اتصال به شبکه‌هایی با قابلیت IPv6، این اجازه را می‌دهد که در صورت "
 "شکست خوردن پیکربندی‌های IPv4 و موفقیت پیکربندی‌های IPv6، اتصال برقرار شود."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_مسیریاب‌ها..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "غیر فعال شد"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2027,15 +2253,19 @@ msgstr ""
 "آدرس‌های آی‌پی کارگزارهای نام دامنه استفاده شده جهت تشخصی نام میزبان‌ها. از "
 "کاما برای جدا کردن آدرس‌های کارگزارهای نام دامنه استفاده کنید."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "به آدرس‌دهی آی‌پی _نسخه ۶ برای تکمیل این اتصال نیاز است"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2043,750 +2273,854 @@ msgstr ""
 "در هنگام اتصال به شبکه‌هایی با قابلیت IPv4، این اجازه را می‌دهد که در صورت "
 "شکست خوردن پیکربندی‌های IPv6 و موفقیت پیکربندی‌های IPv4، اتصال برقرار شود."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "متری"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_وارد کردن"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "مقدماتی"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_شماره:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "شناسه _شبکه:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "تغییر..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "_پین:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "چنانچه شبکه خانگی موجود نبود اجازه‌ی _رومینگ بده"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_نمایش گذرواژه‌ها"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "تصدیق هویت"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "روش‌های مجاز"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "پیکربندی _روش‌ها..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "فشرده‌سازی"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "استفاده از رمزنگاری نقطه به نقطه (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "رمزنگاری ۱۲۸ بیتی _لازم است"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ا_ستفاده از stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "اجازه فشرده‌سازی اطلاعات _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "اجازه فشرده‌سازی اطلاعات _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "استفاده از فشرده‌سازی _سرآیند TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "انعکاس"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "ارسال بسته‌های ا_نعکاسی PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_روش:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "هیچکدام"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_روش:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "پیشرفته"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "شبکه‌های سیمی"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_امنیت: "
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "کلید خصوصی"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "اترنت (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ارتباط پایه:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "اترنت خودکار"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "آدرس سخت‌افزار:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "آدرس سخت‌افزار:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_قدرت انتقال:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_قدرت انتقال:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "واسط:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "واسط:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "آدرس مک _کلون شده:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (۵ گیگاهرتز)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (۲.۴ گیگاهرتز)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ادهاک"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_قدرت انتقال:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "مگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_نرخ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_کانال:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_باند:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "روش‌های مجاز تصدیق هویت"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "پروتکل تصدیق هویت توسعه‌پذیر (Extensible)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "پروتکل تصدیق هویت گذرواژه"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "پرتکل تصدیق هویت Handshake"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "پروتکل تصدیق هویت Challenge Handshake مایکروسافت"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "نسخه _۲ MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "پروتکل تصدیق هویت مایکروسافت Challenge Handshake نسخه ۲"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2795,190 +3129,186 @@ msgstr ""
 "در بیشتر موارد، کارگزارهای ارائه‌دهندگان از تمام روش‌های تصدیق هویت پشتیبانی "
 "می‌کنند.  اگر اتصال شکست خورد، غیرفعال کردن تعدادی از روش‌ها را امتحان کنید."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "شبکه خصوصی مجازی (VPN)"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"افزونه شبکه خصوصی مجازی موفق به واردن کرد صحیح اتصال شبکه مجازی خصوصی نشد\n"
-"\n"
-"خطا: نوع سرویس شبکه خصوصی مجازی مشخص نیست."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "نمی‌توان ارتباط شبکه خصوصی مجازی (VPN) را وارد کرد"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"پرونده «%s» قابل خواندن نبود یا حاپی اطلاعات قابل تشخیص اتصال وی‌پی‌ان نبود\n"
+"افزونه شبکه خصوصی مجازی موفق به واردن کرد صحیح اتصال شبکه مجازی خصوصی نشد\n"
 "\n"
-"خطا: %s"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "خطا ناشناس"
+"خطا: نوع سرویس شبکه خصوصی مجازی مشخص نیست."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "پرونده را برای وارد کردن انتخاب کنید"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "آدرس سخت‌افزار:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "به دلیل یک خطا ناشناس، محاوره ویرایش اتصال نمی‌تواند مقدار دهی اولیه شود."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "ساخت ارتباط جدید امکان‌پذیر نیست"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "حذف ارتباط ناموفق بود"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "آیا مطمئن هستید که می خواهید اتصال %s را پاک کنید؟"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "آدرس"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "نقاب شبکه"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "دروازه"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "متری"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "پیشوند"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "ویرایش %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "ویرایش ارتباط بی‌نام"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "نام _اتصال:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "خطا در هنگام مقدار دهی اولیه ویرایشگر"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "اضافه‌کردن اتصال شکست خورد"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2986,56 +3316,53 @@ msgstr ""
 "ویرایشگر اتصال نتوانست تعدادی از منابع لازم را پیدا کند ( پرونده ui پیدا "
 "نشد)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ذخیره تمام تغییرات اعمال شده بر روی این اتصال."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "برای ذخیره این اتصال برای تمام کاربرها در این ماشین تصدیق هویت لازم است."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "ساخت ارتباط جدید امکان‌پذیر نیست"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ارتباط قابل ویرایش نیست"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "خطا در ساخت محاوره ویرایشگر اتصال."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "خطا در هنگام مقدار دهی اولیه ویرایشگر"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "اضافه‌کردن اتصال شکست خورد"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3044,203 +3371,249 @@ msgstr ""
 "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت EAP برروی "
 "true تنظیم کنید."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "نام _اتصال:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_خارج کردن"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "برچسب"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "برچسب"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "هیچ وقت"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "اکنون"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%Id دقیقه گذشته"
 msgstr[1] "%Id دقیقه گذشته"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%Id ساعت گذشته"
 msgstr[1] "%Id ساعت گذشته"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%Id روز گذشته"
 msgstr[1] "%Id روز گذشته"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%Id ماه گذشته"
 msgstr[1] "%Id ماه گذشته"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%Id سال گذشته"
 msgstr[1] "%Id سال گذشته"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "اضافه‌کردن اتصال شکست خورد"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "اتصال سیمی %Id"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "اتصال سیمی %Id"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "نام"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "آخرین بار استفاده"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "ویرایش اتصال انتخاب شده"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "برای ویرایش اتصال انتخاب شده تصدیق هویت کنید"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "حذف اتصال انتخاب شده"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "برای حذف اتصال انتخاب شده تصدیق هویت کنید"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "نوع ارتباط‌های شبکه پهن‌باند که پشتیبانی نمی‌شود."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "نمی‌دانم چه طور اتصال‌های «%s» را بسازم"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "خطا در هنگام ویرایش ارتباط"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "خطا در هنگام ساخت ارتباط"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "اضافه‌کردن اتصال شکست خورد"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "نمی‌دانم چه طور اتصال‌های «%s» را بسازم"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "خطا در هنگام ویرایش ارتباط"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "ارتباطی با UUIDی «%s» یافت نشد"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "اتصال‌های شبکه"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "امنیت 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "نمی‌توان واسط کاربری امنیت وای‌فای را بارگیری کرد."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "از امنیت 802.1_X برای این ارتباط استفاده شود"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "نمی‌توان دستگاه بلوتوثی پیدا کرد."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "اتصال سیمی %Id"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "فعال‌سازی _شبکه"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "شبکه بی‌سیم"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "دی‌ان‌اس اصلی:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "اتصال سیمی %Id"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "اتصال سیمی %Id"
@@ -3248,34 +3621,39 @@ msgstr "اتصال سیمی %Id"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "امکان بارگزاری واسط کاربری DSL وجود ندارد."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "امکان بارگزاری واسط کاربری DSL وجود ندارد."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "واسط:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "اتصال دی‌اس‌ال %Id"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3285,57 +3663,56 @@ msgstr ""
 "این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
 "اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "رد شد"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "اترنت (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "آدرس مک _کلون شده:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "اتصال سیمی %Id"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3346,184 +3723,188 @@ msgstr ""
 "این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
 "اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "امکان بارگزاری واسط کاربری Wi-Fi وجود ندارد."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "اتصال سیمی %Id"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "نمی‌توان واسط کاربری آی‌پی نسخه ۴ را بارگزاری کرد."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "اتصال سیمی %Id"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "خودکار (شبکه خصوصی مجازی VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "خودکار (شبکه خصوصی مجازی) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "خودکار، فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "خودکار (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "خودکار (PPPoE) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "خودکار (DHCP) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "فقط پیوند محلی"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "کارگزارهای _دی‌ان‌اس اضافی:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "دامنه‌های _جست‌وجو اضافی:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "ویرایش مسیرهای آی‌پی نسخه ۴ برای %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "تنظیمات آی‌پی نسخه ۴"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "نمی‌توان واسط کاربری آی‌پی نسخه ۴ را بارگزاری کرد."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "خودکار، فقط DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "ویرایش مسیرهای آی‌پی نسخه ۶ برای %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "تنظیمات آی‌پی نسخه ۶"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "امکان بارگزاری آی‌پی ورژن ۶ وجود ندارد."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "امکان بارگزاری واسط کاربری DSL وجود ندارد."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "اتصال دی‌اس‌ال %Id"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "امکان بارگزاری واسط کاربری شبکه پهن‌باند وجود ندارد."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "نوع ارتباط‌های شبکه پهن‌باند که پشتیبانی نمی‌شود."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "نوع ارائه‌دهنده پهن‌باند همراه را انتخاب کنید"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3532,7 +3913,7 @@ msgstr ""
 "فناوری که ارائه‌دهنده شبکه پهن‌باند تلفن همراه استفاده می‌کند را انتخاب کنید. "
 "اگر شما مطمئن نیستید، با ارائه‌دهنده خود تماس بگیرید."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ارائه‌دهنده من از فناوری _GSM-based استفاده می‌کند (مانند GPRS, EDGE, UMTS, "
@@ -3540,84 +3921,80 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ارائه‌دهنده من از فناوری C_DMA-based استفاده می‌کند (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "جی‌اس‌ام"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "هیچکدام"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "درحال ویرایش روش‌های تصدیق هویت PPP برای %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "تنظیمات PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "امکان بارگزاری واسط کاربری PPP وجود ندارد."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "اتصال سیمی %Id"
@@ -3625,11 +4002,11 @@ msgstr "اتصال سیمی %Id"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
@@ -3637,59 +4014,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "هیچ اتصال شبکه وجود ندارد"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "نمی‌توان واسط کاربری آی‌پی نسخه ۴ را بارگزاری کرد."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "ارتباط شبکه خصوصی مجازی %Id"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "امکان بارگزاری واسط کاربری شبکه خصوصی مجازی (VPN) وجود ندارد."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "افزونه‌های سرویس شبکه خصوصی مجازی (VPN) برای «%s» پیدا نشد."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "افزونه‌های سرویس شبکه خصوصی مجازی (VPN) برای «%s» پیدا نشد."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "اتصال شکست خورد"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "امکان بارگزاری واسط کاربری شبکه خصوصی مجازی (VPN) وجود ندارد."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "افزونه‌های سرویس شبکه خصوصی مجازی (VPN) برای «%s» پیدا نشد."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "ارتباط شبکه خصوصی مجازی %Id"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "نوع شبکه خصوصی مجازی (VPN) را انتخاب کنید"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3700,7 +4077,7 @@ msgstr ""
 "کنید. اگر نوع اتصالی که می خواهید بسازید در لیست وجود ندارد، ممکن است افزونه "
 "صحیح شبکه خصوصی مجازی را نصب ندارید."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3709,7 +4086,7 @@ msgstr ""
 "این گزینه اتصال به نقطه دسترسی بی‌سیم (AP) مشخص شده توسط BSSID وارد شده را "
 "قفل می‌کند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3719,100 +4096,98 @@ msgstr ""
 "این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
 "اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%Iu (%Iu مگاهرتز)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "امکان بارگزاری واسط کاربری Wi-Fi وجود ندارد."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "هر دستگاهی"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "اتصال سیمی %Id"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید وپ ۴۰/۱۲۸ بیتی (Hex یا ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "وپ پویا (x02.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 شخصی"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "نمی‌توان واسط کاربری وای‌فای را بارگیری کرد؛ تنظیمات وای‌فای وجود ندارد."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "امنیت بی‌سیم"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "نمی‌توان واسط کاربری امنیت وای‌فای را بارگیری کرد."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "یک پرونده به نام «%s» درحال حاظر وجود دارد."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_جای‌گزینی"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "آیا می‌خواهید %s را با شبکه مجازی خصوصی (VPN) که درحال ذخیره کردن آن هستید "
 "جای‌گزین کنید؟"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "نمی‌توان ارتباط شبکه خصوصی مجازی را صادر کرد"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3823,455 +4198,418 @@ msgstr ""
 "\n"
 "خطا: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_بازکردن قفل"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "بطور خودکار این دستگاه را باز کن"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "اطلاعات اتصال"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "اتصال‌های فعال شبکه"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "مجوز CA انتخاب کنید"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "کلید خصوصی"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "گذرواژه کلید _خصوصی:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "مجوز CA انتخاب کنید"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "مجوز _کاربر:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "شبکه پهن‌باند تلفن همراه شما با تنظیمات مقابل پیکربندی شده است:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "کشور من در فهرست نیست"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "دستگاه شما:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr "فهرست نشده"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ارئه‌دهنده شما:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "پلان من در فهرست نیست..."
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "پلان شما:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "ارائه‌دهنده"
 
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "دستگاه GSM نصب شده"
+
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "دستگاه CDMA نصب شده"
+
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "هر دستگاهی"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
-"هم‌اکنون یک اتصال به ارائه کننده پهن‌باند شما با تنظیماتی که انتخاب کرده‌اید "
-"ایجاد می‌شود. اگر ایجاد اتصال شکست خورد یا نمی‌توانید به منابع شبکه دسترسی "
-"پیدا کنید، تنظیمات خود را دوباره بررسی کنید. برای تغییر تنظیمات اتصال "
-"پهن‌باند تلفن همراه، «اتصال‌های شبکه» را از منوی سیستم >> ترجیحات انتخاب کنید."
+"این دستیار کمک می‌کند تا شما به راحتی یک ارتباط باند پهن تلفن همراه را به "
+"عنوان تلفن همراه (3G) راه‌اندازی کنید."
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "شما به اطلاعات زیر نیاز خواهید داشت:"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
-msgstr "فهرست نشده"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "نام ارائه‌دهنده شبکه پهن‌باند"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "پلان خود را _انتخاب کنید"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr "نام پلان مالی شبکه پهن‌باند"
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "پلان انتخاب _شده APN (نام Access Point)"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(در بعضی موارد) هزینه‌ی استفاده از شبکه پهن‌باند APN (نام نقطه دسترسی)"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"هشدار: انتخاب پلان نادرست ممکن است در مسائل مربوط به صدور صورت حساب برای "
-"حساب پهن‌باند شما تاثیر بگذارد و یا از ارتباط جلوگیری کند.\n"
-"\n"
-"اگر شما از پلان خود مطمئن نیستید، از ارائه‌دهنده خود در مورد APN پلان خود "
-"بپرسید."
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "یک اتصال برای ا_ین شبکه پهن‌باند تلفن همراه بساز:"
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "پلان مالی خود را انتخاب کنید"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
+msgstr "برپاسازی اتصال شبکه تلفن همراه پهن‌باند"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.ui:189
 #, fuzzy
-msgid "My plan is not listed…"
-msgstr "پلان من در فهرست نیست..."
+msgid "Country or region:"
+msgstr "کشور یا منطقه"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "کشور یا منطقه ارائه‌دهنده خود را انتخاب کنید"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "ارائه‌دهنده خود را از یک _فهرست انتخاب کنید:"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-msgstr "ارائه‌دهنده"
-
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
-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 set up the connection _manually:"
 msgstr ""
 "من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را وارد "
 "نمایم:"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ارئه دهنده:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "ارائه‌دهنده من از فناوری GSM استفاده می‌کند (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "ارائه‌دهنده من از فناوری CDMA استفاده می‌کند. (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ارائه‌دهنده خود را انتخاب کنید"
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "فهرست کشور یا منطقه:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "کشور یا منطقه"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "پلان خود را _انتخاب کنید"
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "کشور من در فهرست نیست"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "پلان انتخاب _شده APN (نام Access Point)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "کشور یا منطقه ارائه‌دهنده خود را انتخاب کنید"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "دستگاه GSM نصب شده"
-
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "دستگاه CDMA نصب شده"
-
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"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."
 msgstr ""
-"این دستیار کمک می‌کند تا شما به راحتی یک ارتباط باند پهن تلفن همراه را به "
-"عنوان تلفن همراه (3G) راه‌اندازی کنید."
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "شما به اطلاعات زیر نیاز خواهید داشت:"
+"هشدار: انتخاب پلان نادرست ممکن است در مسائل مربوط به صدور صورت حساب برای "
+"حساب پهن‌باند شما تاثیر بگذارد و یا از ارتباط جلوگیری کند.\n"
+"\n"
+"اگر شما از پلان خود مطمئن نیستید، از ارائه‌دهنده خود در مورد APN پلان خود "
+"بپرسید."
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-#, fuzzy
-msgid "Your broadband provider’s name"
-msgstr "نام ارائه‌دهنده شبکه پهن‌باند"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "پلان مالی خود را انتخاب کنید"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr "نام پلان مالی شبکه پهن‌باند"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "شبکه پهن‌باند تلفن همراه شما با تنظیمات مقابل پیکربندی شده است:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(در بعضی موارد) هزینه‌ی استفاده از شبکه پهن‌باند APN (نام نقطه دسترسی)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "دستگاه شما:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "یک اتصال برای ا_ین شبکه پهن‌باند تلفن همراه بساز:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ارئه‌دهنده شما:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "هر دستگاهی"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "پلان شما:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
-msgstr "برپاسازی اتصال شبکه تلفن همراه پهن‌باند"
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"هم‌اکنون یک اتصال به ارائه کننده پهن‌باند شما با تنظیماتی که انتخاب کرده‌اید "
+"ایجاد می‌شود. اگر ایجاد اتصال شکست خورد یا نمی‌توانید به منابع شبکه دسترسی "
+"پیدا کنید، تنظیمات خود را دوباره بررسی کنید. برای تغییر تنظیمات اتصال "
+"پهن‌باند تلفن همراه، «اتصال‌های شبکه» را از منوی سیستم >> ترجیحات انتخاب کنید."
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(هیچکدام)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "_مجوز CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "ناشناس"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "مجوز CA انتخاب کنید"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "مجوز _کاربر:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "خطا در هنگام ویرایش ارتباط"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_بازکردن قفل"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "این گذرواژه هر بار پرسیده شود"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "برای اتصال با «%s» به کلمه عبور نیاز دارید."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_گذرواژه:"
+msgid "Sh_ow passwords"
+msgstr "_نمایش گذرواژه‌ها"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_گذرواژه:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_نمایش گذرواژه‌ها"
+msgid "_Secondary Password:"
+msgstr "_گذرواژه:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_گذرواژه:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ارتباط قطع شده"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "هیچکدام"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "وپ پویا (x02.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_ساخت"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "برای دسترسی به شبکه بی‌سیم «%s»، گذرواژه‌ها یا کلیدهای رمز نگاری شده نیاز است."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ساخت یک شبکه بی‌سیم جدید"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "شبکه بی‌سیم جدید"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نام شبکه بی‌سیمی را که می خواهید بسازید وارد کنید."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصال به شبکه بی‌سیم مخفی "
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "شبکه‌های بی‌سیم مخفی"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4279,37 +4617,57 @@ msgid ""
 msgstr ""
 "نام و جزئیات امنیتی شبکه مخفی که می‌خواهید به آن متصل شوید را وارد کنید."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "ا_منیت بی‌سیم:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "ا_رتباط:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "آ_داپتور بی‌سیم:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"من نمی توانم ارائه‌دهنده خود را پیدا کنم و می خواهم به طور _دستی آن را وارد "
+"نمایم:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ارئه دهنده:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "فهرست کشور یا منطقه:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "کشور یا منطقه"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "سیمی"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4319,17 +4677,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ا_منیت بی‌سیم:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "نام _شبکه:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ا_رتباط:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "آ_داپتور بی‌سیم:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "کاربرد:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4337,7 +4719,7 @@ msgstr ""
 "این برنامه بخشی از برنامه مدیریت شبکه است (https://wiki.gnome.org/Projects/"
 "NetworkManager/)"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4345,415 +4727,464 @@ msgstr ""
 "این برای خط فرمان تعامل کنند تهیه نشده است اما به جای آن  در محیط میز کار "
 "گنوم اجرا می شود."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "فعال نشده"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ثبت نشده"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "شبکه خانگی (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "شبکه خانگی"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "درحال جستجو"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "اجازه ثبت داده نشد"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s رومینگ)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (رومینگ)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "شبکه رومینگ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "شبکه رومینگ"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "کد PIN برای SIM کارت «%s» بر روی «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "پین کد مورد نیاز است"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "برای دستگاه پهن‌باند شبکه تلفن همراه به پین کد نیاز است"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "ارتباط پهن‌باند «%s» فعال شد: (٪%Id%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "رومینگ"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "اتصال %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "گواهینامه‌های DER یا PEM شامل (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "کلیدهای خصوصی DER, PEM, یا PKCS#12 ی(*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "یک پرونده PAC انتخاب کنید..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "پرونده‌های PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "تمام پرونده‌ها"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "ناشناس"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "تصدیق هویت شد"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "هر دو"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "هویت _ناشناس:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_پرونده PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "تصدیق هویت _درونی:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "استفاده از تامینِ خودکار PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "یک مجوز مجاز انتخاب کنید..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "نسخه ۰"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "نسخه ۱"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "_مجوز CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "ن_سخه PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "عبارت عبور وپ ۱۲۸ بیتی"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_نمایش گذرواژه‌ها"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "نادیده گرفتن گواهینامه‌ی CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_هویت:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS تونل شده"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP محافظت شده (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_تصدیق هویت:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "۱ (پیش‌فرض)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "سیستم باز"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "کلید به اشتراک گذاشته شده"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "۱ (پیش‌فرض)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_کلید:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_نمایش کلید"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_نمایه وپ:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_نوع:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (پیش‌فرض)"
+
+#~ msgid "Ignored"
+#~ msgstr "رد شد"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "بروزرسانی رمز اتصال‌ها به دلیل یک خطای ناشناس شکست خورد."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "۲"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "۳"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "۴"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_اطلاعات اتصال"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "نمی‌توان ارتباط شبکه خصوصی مجازی (VPN) را وارد کرد"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "پرونده «%s» قابل خواندن نبود یا حاپی اطلاعات قابل تشخیص اتصال وی‌پی‌ان "
+#~ "نبود\n"
+#~ "\n"
+#~ "خطا: %s"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "خطا ناشناس"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "یک مجوز مجاز انتخاب کنید..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "_مجوز CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "برنامک مدیریت شبکه"
@@ -4790,15 +5221,6 @@ msgstr "_نوع:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "۲"
-
-#~ msgid "3"
-#~ msgstr "۳"
-
-#~ msgid "4"
-#~ msgstr "۴"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "مذاکره _خودکار"
 
@@ -4906,12 +5328,6 @@ msgstr "_نوع:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "دی‌ان‌اس دوم:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "دی‌ان‌اس سوم:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "فعال سازی پهن‌باند تلفن همراه _وایمکسی"
 
@@ -4957,12 +5373,6 @@ msgstr "_نوع:"
 #~ msgid "_Save..."
 #~ msgstr "_ذخیره..."
 
-#~ msgid "_Import"
-#~ msgstr "_وارد کردن"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "اتصال _خودکار"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "در دسترس برای همه کاربرها"
 
@@ -5019,9 +5429,6 @@ msgstr "_نوع:"
 #~ msgid "Error: %s"
 #~ msgstr "خطا: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "ساخت اتصال DUN شکست خورد: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "تلفن شما هم اکنون آماده استفاده است!"
 
diff --git a/po/fi.po b/po/fi.po
index 4d45de23..58d91d13 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2016-03-13 18:15+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -28,39 +29,48 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-POT-Import-Date: 2012-02-19 15:25:27+0000\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Verkko"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Hallitse verkkoyhteyksiä"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Verkkoyhteydet"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktiiviset verkkoyhteydet"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Hallitse ja muuta verkkoyhteyksien asetuksia"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Älä näytä ilmoitusta kun yhteys muodostuu"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
 "verkkoa."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Älä näytä ilmoitusta kun yhteys katkeaa"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -68,11 +78,11 @@ msgstr ""
 "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
 "katkaistaan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Poista VPN-ilmoitukset käytöstä"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -81,11 +91,11 @@ msgstr ""
 "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun verkkoyhteys "
 "katkaistaan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Älä näytä ilmoituksia saatavilla olevista verkoista"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -93,19 +103,20 @@ msgstr ""
 "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun langattomia "
 "verkkoja on saatavilla."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Leima"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Määrittää, tuodaanko asetukset uuteen versioon."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Estä Wi-Fi-luonti"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -113,153 +124,166 @@ msgstr ""
 "Aseta OIKEA estääksesi väliaikaisten verkkojen luonnin kun liitännäinen on "
 "käytössä"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Näytä sovelma ilmoitusalueella"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Älä huomioi CA-varmennetta"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Verkon hallinta -sovelma"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-tunnistautuminen"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Verkon nimi:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Yhteyden lisäys/aktivointi epäonnistui"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Yhteysvirhe"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Laitteen katkaisu epäonnistui"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Katkaisuvirhe"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Yhteyden aktivointi epäonnistui"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Älä näytä tätä uudestaan"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu pysäytettiin odottamatta."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelulta saatiin virheellinen "
 "asetusmäärittely."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska yhteyttä palveluun ei saatu."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -318,7 +342,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu ei käynnistynyt sallitussa "
 "ajassa."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -327,7 +351,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelua ei voitu käynnistää."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -336,7 +360,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska kelvollisia VPN-salaisuuksia ei löytynyt."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -345,7 +369,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui virheellisten VPN-salaisuuksien takia."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -354,7 +378,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -365,19 +389,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-yhteys on muodostettu onnistuneesti.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-yhteys epäonnistui"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,7 +414,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -403,559 +427,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "laite ei ole valmiina"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "laite ei valmis"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "katkaistu"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "laitetta ei hallita"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Määrittele VPN-yhteys…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Verkon hallinta ei ole käytössä…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Ota _wifi käyttöön"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Ota _mobiililaajakaista käyttöön"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Ota ilm_oitukset käyttöön"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Muokkaa yhteyksiä…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Yhteys verkkoon ”%s” on nyt muodostettu."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Verkkoyhteys on nyt katkaistu."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Käyttäjätunnistautuminen vaaditaan verkkoyhteydelle ”%s”…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Pyydetään verkko-osoitetta verkosta ”%s”…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Käynnistetään VPN-yhteyttä ”%s”…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Pyydetään VPN-osoitetta yhteydelle ”%s”…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-yhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Verkon hallinta -sovelma"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Väärä PUK-koodi. Ota yhteys palveluntarjoajaasi."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Väärä PIN-koodi. Ota yhteys palveluntarjoajaasi."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Lähetetään lukituksen avauskoodia…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiililaajakaista (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobiililaajakaista"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Saatavilla"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Uusi mobiililaajakaistayhteys"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Yhteys muodostettu"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobiililaajakaistaverkko."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Olet nyt rekisteröitynyt kotiverkkoon."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Olet nyt rekisteröitynyt vierailuverkkoon."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Valmistellaan mobiililaajakaistayhteyttä ”%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Tehdään mobiililaajakaistayhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Käyttäjätunnistautuminen vaaditaan mobiililaajakaistayhteydelle ”%s”…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobiililaajakaistayhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automaattinen Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet-verkot (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet-verkko (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet-verkot"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet-verkko"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Yhteys ethernet-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Valmistellaan ethernet-verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Tehdään ethernet-verkkoyhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Käyttäjätunnistautuminen vaaditaan ethernet-verkolle ”%s”…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Pyydetään verkko-osoitetta ethernet-verkosta ”%s”…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet-verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-todentaminen"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_OK"
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Yhdistä piilotettuun wifi-verkkoon"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Luo uusi wifi-verkko"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Uuden yhteyden lisäys epäonnistui"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wifi-verkot (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wifi-verkko (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wifi-verkko"
 msgstr[1] "Wifi-verkot"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wifi ei ole käytössä"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wifi on kytketty pois käytöstä laitteessa olevasta painikkeesta"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Lisää verkkoja"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wifi-verkkoja saatavilla"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Käytä verkkovalikkoa yhdistääksesi wifi-verkkoon"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Yhteys wifi-verkkoon ”%s” on nyt muodostettu."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Valmistellaan wifi-verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Tehdään wifi-verkkoyhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Käyttäjätunnistautuminen vaaditaan wifi-verkolle ”%s”…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Pyydetään verkko-osoitetta wifi-verkosta ”%s”…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wifi-verkkoyhteys ”%s” on aktiivinen: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wifi-verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Yhteyden aktivointi epäonnistui"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynaaminen WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Lisää osoitteita"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (oletus)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Yleisosoite"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Aliverkkopeite"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Ensisijainen DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Toissijainen DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Kolmas DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Verkkolaite"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Fyysinen osoite"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Ajuri"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Tietoturva:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Oletusyhdyskäytävä"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ohitettu"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Yhteyspiste"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Salasana:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-tyyppi"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-yhdyskäytävä"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-käyttäjänimi"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-selite"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Yhteys"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Toimivia aktiivisia yhteyksiä ei löytynyt!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -963,16 +1013,20 @@ msgstr ""
 "Tekijänoikeus © 2005-2008 Novell, Inc.\n"
 "ja monet muut kehittäjät sekä kääntäjät"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ilmoitusalueen sovelma verkkolaitteiden ja -yhteyksien hallintaan."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManagerin verkkosivusto"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -980,33 +1034,33 @@ msgstr ""
 "Verkonhallintasovelma ei löytänyt joitain tarvitsemiaan resursseja (.ui-"
 "tiedostoa ei löytynyt)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Puuttuvia resursseja"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobiililaajakaistaverkon salasana"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Yhteys verkkoon ”%s” vaatii salasanan."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1015,25 +1069,25 @@ msgstr ""
 "Mobiililaajakaistalaite ”%s” vaatii SIM-kortin PIN-koodin ennen käyttöä."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-koodi:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Näytä PIN-koodi"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1042,35 +1096,42 @@ msgstr ""
 "Mobiililaajakaistalaite ”%s” vaatii SIM-kortin PUK-koodin ennen käyttöä."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-koodi:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Uusi PIN-koodi:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Syötä uusi PIN-koodi uudelleen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Näytä PIN-/PUK-koodit"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Tietoja yhteydestä"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN-yhteyden luominen epäonnistui: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1079,56 +1140,56 @@ msgstr ""
 "IP-osoite on tietokoneen tunniste verkossa. Napsauta ”Lisää”-painiketta "
 "lisätäksesi IP-osoitteen."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Lisää"
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Jätä huomiotta automaattisesti vastaa_notetut reitit"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Käytä tätä yhteyttä _vain tässä verkossa oleviin resursseihin"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Jos käytössä, tätä yhteyttä ei koskaan käytetä oletusverkkoyhteytenä."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Luo…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Valitse yhteyden tyyppi"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1141,85 +1202,100 @@ msgstr ""
 "tietokoneelta puuttunee vaadittu\n"
 "VPN-liitännäinen."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Laite:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Kiertovuorottelu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktiivinen varmuuskopio"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Yleislähetys"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Sopeutuva välityksen kuormanjako (TLB)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Sopeutuva kuormanjako (ALB)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (suositeltu)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Sidotut _yhteydet:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_enetelmä:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Tarkkailun ti_heys:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Liitännän nimi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Linkin _tarkkailu:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP-_kohteet:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1227,123 +1303,182 @@ msgstr ""
 "IP-osoite, tai pilkuin eroteltu lista IP-osoitteista, joita etsitään linkin "
 "tilaa tarkistaessa."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Linkin _pystytysviive:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Linkin ti_putusviive:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Ensisijainen:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "tavua"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioriteetti:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hairpin-tila:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Siltaavat _yhteydet:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "Linkin ti_putusviive:"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Ota _verkko käyttöön"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Käytä _STP:tä (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Enimmäisikä:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Vanhenemisaika:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automaattinen"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "oletus"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "määrittelemätön virhe"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Käytä"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1354,430 +1489,532 @@ msgstr ""
 "jolla tämä yhteys muodostetaan. Toiminto tunnetaan termeillä ”MAC cloning” "
 "ja ”MAC spoofing”. Esimerkki: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC-osoite"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Osoite"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "virheellinen %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN-liitännän _nimi:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Fyysinen osoite:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, fuzzy, c-format
 msgid "invalid %s (%s): "
 msgstr "virheellinen %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "laite"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, fuzzy, c-format
 msgid "invalid %s (%s) "
 msgstr "virheellinen %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Yhteyden salaisuuksien päivittäminen epäonnistui tuntemattoman syyn takia."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Käytä DCB:tä (Data Center Bridging) tälle yhteydelle"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Vuonohjaus"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Käytä"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Mainosta"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Suostuva"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Valinnat..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioriteettiryhmät"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Kuitu"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioriteettivuonohjaus"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioriteetti:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Liikenneluokka:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Tiukka kaista:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Prioriteettikaista:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Ryhmäkaista:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Ryhmätunniste:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Palvelu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Näytä _salasana"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Salasana:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Verkkolaite"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Isäntäliitäntä:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Isäntäliitäntä:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Parikaapeli (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ohita"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuaalinen"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Portti:"
 
-#: ../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 "_Laite:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "_Kopioitu MAC-osoite:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Wake on LAN-salasana:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Oletus"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ohita"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Yleislähetys"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "_Wake on LAN-salasana:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "Nopeu_s:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Kaksisuuntainen duple_ksi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Muodosta _VPN-yhteys automaattisesti tätä yhteyttä käyttäessä"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Kyllä"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Ei"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "_Kaikki käyttäjät voivat yhdistää tähän verkkoon"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Yhdistä tähän verkkoon automaattisesti sen ollessa käytettävissä"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Muodosta _VPN-yhteys automaattisesti tätä yhteyttä käyttäessä"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Tietoja _yhteydestä"
+msgid "Firewall _zone"
+msgstr "Palomuurin _vyöhyke:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Tiimi_yhteydet:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Yhdistä _automaattisesti"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "Palomuurin _vyöhyke:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1786,7 +2023,7 @@ msgstr ""
 "IP-osoite on tietokoneen tunniste verkossa. Napsauta ”Lisää”-painiketta "
 "lisätäksesi IP-osoitteen."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1794,128 +2031,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automaattinen, vain osoitteet"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Osoitteet"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Siirtotila:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrammi"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Siirtotila:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Laitteen nimi + numero"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet-laite"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Tila:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automaattinen omavalintaisilla DNS-asetuksilla"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Linkkipaikallinen"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Jaettu muille tietokoneille"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Menetelmä:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1926,8 +2167,8 @@ msgstr ""
 "tietokoneesi laiteasetuksia. Jos haluat käyttää DHCP:n asiakasohjelman "
 "tunnistetta, syötä se tähän."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1935,25 +2176,26 @@ msgstr ""
 "Verkko-osoitetta käytetään verkkonimiä määritettäessä. Käytä pilkkuja "
 "useampien verkko-osoitteiden erittelemiseen."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP-asiakastunniste:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Etsittävät toimialueet:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS-palvelimet:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1962,11 +2204,11 @@ msgstr ""
 "määrittämiseen. Käytä pilkkuja eritelläksesi useiden nimipalvelinten "
 "osoitteita."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Vaadi IPv4-osoite tälle yhteydelle"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1974,25 +2216,35 @@ msgstr ""
 "Kun yhdistetään IPv6-tuettuihin verkkoihin, salli yhteyden muodostus mikäli "
 "IPv4:n käyttöönotto epäonnistuu, mutta IPv6:n käyttöönotto onnistuu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Reitit…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Käytössä (suosi julkista osoitetta)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Käytössä (suosi väliaikaista osoitetta)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Käytä"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2003,15 +2255,20 @@ msgstr ""
 "määrittämiseen. Käytä pilkkuja eritelläksesi useiden nimipalvelinten "
 "osoitteita."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6-_yksityisyyslaajennukset:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Vaadi IPv6-osoite tälle yhteydelle"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2019,754 +2276,863 @@ msgstr ""
 "Kun yhdistetään IPv4-tuettuihin verkkoihin, salli yhteyden muodostus mikäli "
 "IPv6:n käyttöönotto epäonnistuu, mutta IPv4:n käyttöönotto onnistuu."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metric"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Tuo"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Yksinkertainen"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "V_erkon tunniste:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Muuta…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Salli verkkovierailu (_roaming), jos kotiverkkoa ei ole saatavilla"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Näy_tä salasanat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Todennus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Sallitut tavat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Muuta _menetelmien asetuksia…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Pakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Käytä point-to-point-salausta (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Vaadi 128-bittinen salaus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Käytä tilalli_sta MPPE:tä"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Salli _BSD-datanpakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Salli _Deflate-datanpakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Käytä TCP-otsa_kkeiden pakkausta"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Kaiku"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Lähetä PPP-kaiutuspak_etteja"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Menetelmä:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Tuo tiimiasetukset tiedostosta..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Menetelmä:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Lisäasetukset"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet-verkot"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioriteetti:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioriteetti:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioriteetti:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Y_ksityinen avain:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Linkin _pystytysviive:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Linkin ti_putusviive:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Isäntäliitäntä:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP-_kohteet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP-_kohteet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Tuo tiimiasetukset tiedostosta..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_JSON-määritys:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Ryhmäkaista:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioriteetti"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet-laite"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Tiimi_yhteydet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Fyysinen osoite:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Fyysinen osoite:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioriteetti:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Lähetyste_ho:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Lähetyste_ho:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Isäntäliitäntä:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN-liitännän _nimi:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "_Kloonattu MAC-osoite:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLANin _tunniste:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Liput:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Laitteen nimi + numero"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + numero"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Tietoturva:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Yhteyspiste"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Lähetyste_ho:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Nopeus:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanava"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Taajuus_alue"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SSID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Ei polkit-valtuutusta tämän toimenpiteen suorittamiseksi"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Sallitut todennustavat"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication -yhteyskäytäntö"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication -yhteyskäytäntö"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication -yhteyskäytäntö"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication -yhteyskäytäntö"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication -yhteyskäytäntö versio 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2776,186 +3142,182 @@ msgstr ""
 "tunnistautumistapoja. Jos yhteys kuitenkin epäonnistuu, poista käytöstä "
 "joitain tunnistautumistapoja."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Sidonta"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tiimi"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Silta"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN-liitännäinen ei onnistunut tuomaan VPN-yhteyttä oikein\n"
-"\n"
-"Virhe: VPN-palvelutyyppiä ei määritelty."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN-yhteyttä ei voi tuoda"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Tiedostoa ”%s” ei voitu lukea tai se ei sisällä tunnistettuja VPN-yhteyden "
-"tietoja\n"
+"VPN-liitännäinen ei onnistunut tuomaan VPN-yhteyttä oikein\n"
 "\n"
-"Virhe: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
-msgstr "tuntematon virhe"
+"Virhe: VPN-palvelutyyppiä ei määritelty."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Valitse tuotava tiedosto"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Fyysinen"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuaalinen"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Tuo tallennetut VPN-asetukset..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Yhteysmuokkainikkunaa ei voitu alustaa tuntemattoman virheen takia."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Uutta yhteyttä ei voi luoda"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Yhteyden poistaminen epäonnistui"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Haluatko varmasti poistaa yhteyden %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-yhteydet"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Verkkopeite"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Muokataan %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Nimettömän yhteyden muokkaus"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Yhteyden nimi puuttuu"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Virhe alustettaessa muokkainta"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Yhteyttä ei voi muokata"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Virheellinen asetus %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2963,248 +3325,291 @@ msgstr ""
 "Yhteysmuokkain ei löytänyt joitain tarvitsemiaan resursseja (.ui-tiedostoa "
 "ei löytynyt)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Tallenna yhteydelle tehdyt muutokset."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Tunnistaudu tallentaaksesi tämän yhteyden kaikille tämän koneen käyttäjille."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Yhteyttä ei voitu muokata"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Tuntematon virhe luotaessa yhteysmuokkaimen ikkunaa."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Virhe alustettaessa muokkainta"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Yhteyden lisääminen epäonnistui"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Sulje"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Yhteyden _nimi:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Vie..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ei koskaan"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "nyt"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Yhteyttä ei voi muokata"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Tiimiyhteys %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Tiimiyhteys %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Viimeksi käytetty"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Muokkaa valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Tunnistaudu muokataksesi valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Poista valittu yhteys"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Tunnistaudu poistaaksesi valitun yhteyden"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Mobiililaajakaistasi yhteystyyppi ei ole tuettu."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ei tiedetä kuinka luodaan ”%s”-yhteyksiä"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Virhe yhteyttä muokattaessa"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Virhe yhteyttä luotaessa"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Yhteyttä ei voi muokata"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "VPN-liitännäisiä ei ole asennettu."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ei tiedetä kuinka luodaan ”%s”-yhteyksiä"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Virhe yhteyttä muokattaessa"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Yhteyttä UUID:llä ”%s” ei löytynyt"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Verkkoyhteydet"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN-yhteydet"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-suojaus"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Turvallisuuskäyttöliittymää 802.1X:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Käytä tällä yhteydellä 802.1X-suojausta"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth-käyttöliittymän lataaminen ei onnistunut."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "virheellinen Bluetooth-laite (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-yhteys %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth-tyyppi"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Valitse Bluetooth-yhteysprofiilin tyyppi."
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet-verkko"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "_Lankapuhelinyhteys"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Käyttöliittymää sidonnalle ei voitu ladata."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "ensisijainen"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sidottu yhteys %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Käyttöliittymää sillalle ei voitu ladata."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Siltaava yhteys %d"
@@ -3212,32 +3617,37 @@ msgstr "Siltaava yhteys %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Sillan portti"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Käyttöliittymää siltauksen portille ei voitu ladata."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Käyttöliittymää DCB:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Käyttöliittymää DSL:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Isäntäliitäntä:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-yhteys %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3247,42 +3657,41 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden verkkolaitteeseen, jonka pysyvä MAC-osoite "
 "annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ohitettu"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet-laite"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "kloonattu MAC-osoite"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN-salasana"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-yhteys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Oletus"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3292,11 +3701,11 @@ msgstr ""
 "sen valinta johtaa palomuurissa asetetun oletusvyöhykkeen käyttöön. Vain "
 "käytettävissä firewalld:n ollessa aktiivinen."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Yleistä käyttöliittymää ei voitu ladata."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3307,183 +3716,187 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden verkkolaitteeseen, jonka pysyvä MAC-osoite "
 "annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband-laite"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-yhteys %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Käyttöliittymää IPv4:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ethernet-yhteys %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automaattinen (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Vain automaattiset osoitteet (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automaattinen, vain osoitteet"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automaattinen (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Vain automaattiset osoitteet (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automaattinen (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Vain automaattiset osoitteet (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Vain linkkiyhteys"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Ylimääräiset _DNS-palvelimet:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Ylimääräiset _etsittävät toimialueet:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Muokataan yhteyden %s IPv4-reittejä"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-asetukset"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Käyttöliittymää IPv4:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, fuzzy, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, fuzzy, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, fuzzy, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, fuzzy, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automaattinen, vain DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Muokataan kohteen %s IPv6-reittejä"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-asetukset"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6-käyttöliittymää ei voi ladata."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, fuzzy, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, fuzzy, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, fuzzy, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, fuzzy, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6-osoite \"%s\" on virheellinen"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX-käyttöliittymän lataus epäonnistui."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX-yhteys %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Käyttöliittymää mobiililaajakaistalle ei voitu ladata."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Mobiililaajakaistasi yhteystyyppi ei ole tuettu."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Valitse mobiililaajakaistan toimittajan tyyppi"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3492,91 +3905,87 @@ msgstr ""
 "Valitse mobiililaajakaistan toimittajan käyttämä tekniikka. Jos olet "
 "epävarma, kysy toimittajalta (operaattorilta)."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Toimittaja käyttää _GSM-pohjaista tekniikkaa (eli GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Toimittaja käyttää _CDMA-pohjaista tekniikkaa (mm. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ei mitään"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Muokataan PPP-todentamistapoja yhteydelle %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-asetukset"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Käyttöliittymää PPP:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Käyttöliittymää sidonnalle ei voitu ladata."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Virhe: tiedosto ei sisällä kelvollista JSON-määritystä"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Tiimikäyttöliittymää ei voitu ladata."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Tiimiyhteys %d"
@@ -3584,69 +3993,69 @@ msgstr "Tiimiyhteys %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Tiimiportti"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Käyttöliittymää tiimin portille ei voitu ladata."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Uusi yhteys..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Vlan-käyttöliittymää ei voitu ladata."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-yhteys %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN-käyttöliittymän lataus epäonnistui."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "VPN-liitännäispalvelua ei löydy kohteelle ”%s”"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "VPN-liitännäispalvelua ei löydy kohteelle ”%s”"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Yhteysvirhe"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN-käyttöliittymän lataus epäonnistui."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "VPN-liitännäispalvelua ei löydy kohteelle ”%s”"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-yhteys %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Valitse VPN-yhteyden tyyppi"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3656,7 +4065,7 @@ msgstr ""
 "Valitse uutta yhteyttä varten käytettävä VPN-tyyppi. Jos haluamasi VPN-"
 "tyyppi ei ole listattuna, tietokoneelta puuttunee vaadittu VPN-liitännäinen."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3665,7 +4074,7 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden langattomaan wifi-tukiasemaan (AP), jonka "
 "BSSID-tunniste annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3675,95 +4084,93 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden verkkolaitteeseen, jonka pysyvä MAC-osoite "
 "annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wifi-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wifi-laite"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wifi-yhteys %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-avain (hexa tai ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynaaminen WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Turvallisuuskäyttöliittymää wifille ei voitu ladata. Wi-Fi-asetus puuttuu."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wifi-tietoturva"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Turvallisuuskäyttöliittymää Wi-Fi:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Tiedosto ”%s” on jo olemassa."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "Ko_rvaa"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Haluatko korvata tiedoston %s VPN-asetuksilla, joita olet tallentamassa?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN-yhteyden asetuksia ei voi viedä"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3774,221 +4181,106 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Vie VPN-asetukset…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Avaa l_ukitus"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Avaa tämän laitteen lukitus automaattisesti"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Tietoja yhteydestä"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktiiviset verkkoyhteydet"
+#: src/info.ui:30
+msgid "_Close"
+msgstr "_Sulje"
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Y_ksityinen avain:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Yksityisen avaimen salasana:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Käyttäjän varmenne:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Mobiililaajakaistayhteys on nyt luotu seuraavilla asetuksilla:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Laite:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Palveluntarjoaja:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Liittymä:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Mobiililaajakaistan tarjoajaan luodaan nyt yhteys valituilla asetuksilla. "
-"Jos yhteys epäonnistuu tai et pääse verkkoon, tarkista asetukset uudelleen. "
-"Muokataksesi mobiililaajakaistayhteyden asetuksia, valitse ”Verkkoyhteydet” "
-"valikosta Järjestelmä >> Asetukset."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Vahvista mobiililaajakaistan asetukset"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Maani ei ole luettelossa"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ei luettelossa"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Valitse liittymä:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Valitun liittymän _APN (Access Point Name):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Varoitus: Virheellisen liittymätyypin valinta voi johtaa laajakaistatilin "
-"laskutusongelmiin tai saattaa estää yhteyden toimivuuden.\n"
-"\n"
-"Jos olet epävarma liittymän tyypistä, kysy palveluntarjoajalta liittymäsi "
-"APN."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Valitse laskutustyyppi"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Ei luettelossa…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Valitse palveluntarjoaja _luettelosta:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tarjoaja"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Tarjoaja:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Valitse palveluntarjoaja"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Maa- tai aluelista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Maa tai alue"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Maani ei ole luettelossa"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Valitse palveluntarjoajasi maa tai alue"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Asennettiin GSM-laite"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Asennettiin CDMA-laite"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Mikä tahansa laite"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Uusi mobiililaajakaistayhteys"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -3996,255 +4288,353 @@ msgstr ""
 "Tämä apulainen mahdollistaa matkapuhelinverkon mobiililaajakaistan helpon "
 "käyttöönoton."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Seuraavat tiedot tarvitaan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Laajakaistan tarjoajan nimi"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Laajakaistan laskutustyypin nimi"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(joissain tapauksissa) Laajakaistan laskutustyypin APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Luo yhteys _tähän mobiililaajakaistalaitteeseen:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Mikä tahansa laite"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobiililaajakaistayhteyden asetukset"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Uusi mobiililaajakaistayhteys"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Maa tai alue"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Valitse palveluntarjoajasi maa tai alue"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Valitse palveluntarjoaja _luettelosta:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Valitse palveluntarjoaja"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Valitse liittymä:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Valitun liittymän _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Varoitus: Virheellisen liittymätyypin valinta voi johtaa laajakaistatilin "
+"laskutusongelmiin tai saattaa estää yhteyden toimivuuden.\n"
+"\n"
+"Jos olet epävarma liittymän tyypistä, kysy palveluntarjoajalta liittymäsi "
+"APN."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Valitse laskutustyyppi"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Mobiililaajakaistayhteys on nyt luotu seuraavilla asetuksilla:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Laite:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Palveluntarjoaja:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Liittymä:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Mobiililaajakaistan tarjoajaan luodaan nyt yhteys valituilla asetuksilla. "
+"Jos yhteys epäonnistuu tai et pääse verkkoon, tarkista asetukset uudelleen. "
+"Muokataksesi mobiililaajakaistayhteyden asetuksia, valitse ”Verkkoyhteydet” "
+"valikosta Järjestelmä >> Asetukset."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Vahvista mobiililaajakaistan asetukset"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ei mitään)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A-varmenne"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Tuntematon"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 #, fuzzy
 msgid "Cancel"
 msgstr "_Peru"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Käyttäjän varmenne:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Virhe yhteyttä muokattaessa"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "Avaa l_ukitus"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Tallenna salasana vain tälle käyttäjälle"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Tallenna salasana kaikille käyttäjille"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Kysy tätä salasanaa joka kerta"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Salasanaa ei vaadita"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Toissijainen salasana:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Näy_tä salasanat"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Toissijainen salasana:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Näy_tä salasanat"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Toissijainen salasana:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Salasana:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Napsauta yhdistääksesi"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ei salausta"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Salasanoja tai salausavaimia tarvitaan wifi-verkkoon ”%s” pääsemiseksi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi-verkon salaustiedot vaaditaan"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi-verkko vaatii salaustietoja"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Luo uusi wifi-verkko"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Uusi wifi-verkko"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Syötä sen wifi-verkon nimi, jonka haluat luoda."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Yhdistä piilotettuun wifi-verkkoon"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Piilotettu wifi-verkko"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Syötä yhdistettävän piilotetun wifi-verkon nimi ja salaustiedot."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Wifi-tietoturva:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Yh_teys:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wifi-verkkol_aite:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Tarjoaja:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Maa- tai aluelista:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Maa tai alue"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kiinteä"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4254,17 +4644,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Wifi-tietoturva:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Verkon nimi:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Yh_teys:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wifi-verkkol_aite:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4272,7 +4684,7 @@ msgstr ""
 "Tämä ohjelma on osa NetworkManageria (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4280,412 +4692,485 @@ msgstr ""
 "Sitä ei ole tarkoitettu komentorivin keskusteluun mutta sen sijaan se toimii "
 "GNOME-työpöytäympäristössä"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ei käytössä"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ei rekisteröity"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kotiverkko (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Kotiverkko"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "etsitään"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "rekisteröinti evätty"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s - verkkovierailu)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (verkkovierailu)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Verkkovierailu (roaming - %s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Vierasverkko"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-koodi SIM-kortille \"%s\" laitteessa \"%s\""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-koodi vaaditaan"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiililaajakaistalaite vaatii PIN-koodin"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobiililaajakaistayhteys ”%s” on aktiivinen (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "verkkovierailu"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s (yhteys)"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "_CA-varmennetta ei vaadita"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "puuttuva EAP-FAST PAC -tiedosto"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Valitse PAC-tiedosto..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (* .pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Todennettu"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Molemmat"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anonyy_mi identiteetti:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC-_tiedosto:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Sisempi tunnistautuminen:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-hankinta"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "puuttuva EAP-LEAP-käyttäjätunnus"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "puuttuva EAP-LEAP-salasana"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "virheellinen EAP-PEAP CA -varmenne: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Valitse varmentajavarmenne…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A-varmenne"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP-_versio:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "puuttuva EAP-käyttäjätunnus"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "puuttuva EAP-salasana"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bittinen tunnuslause"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Näy_tä salasanat"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "_CA-varmennetta ei vaadita"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentiteetti:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "virheellinen EAP-TTLS CA -varmenne: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "NOPEA"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Todentaminen:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-avain puuttuu"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (oletus)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Avoin järjestelmä"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (oletus)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Avain:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Nä_ytä avain"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP-inde_ksi"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tyyppi:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (oletus)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ohitettu"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Yhteyden salaisuuksien päivittäminen epäonnistui tuntemattoman syyn takia."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioriteetti:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Yhdistä tähän verkkoon automaattisesti sen ollessa käytettävissä"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Tietoja _yhteydestä"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN-yhteyttä ei voi tuoda"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Tiedostoa ”%s” ei voitu lukea tai se ei sisällä tunnistettuja VPN-"
+#~ "yhteyden tietoja\n"
+#~ "\n"
+#~ "Virhe: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "tuntematon virhe"
+
+#~ msgid "invalid EAP-PEAP CA certificate: %s"
+#~ msgstr "virheellinen EAP-PEAP CA -varmenne: %s"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Valitse varmentajavarmenne…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A-varmenne"
+
+#~ msgid "invalid EAP-TTLS CA certificate: %s"
+#~ msgstr "virheellinen EAP-TTLS CA -varmenne: %s"
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Verkon hallintasovelma Gnomelle"
 
@@ -4718,30 +5203,6 @@ msgstr "_Tyyppi:"
 #~ 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"
 
@@ -4980,12 +5441,6 @@ msgstr "_Tyyppi:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Vain automaattiset osoitteet (PPP)"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX-käyttöliittymän lataus epäonnistui."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX-yhteys %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5008,9 +5463,6 @@ msgstr "_Tyyppi:"
 #~ msgid "Error: %s"
 #~ msgstr "Virhe: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN-yhteyden luominen epäonnistui: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Puhelimesi on nyt valmis käyttöön."
 
@@ -5052,15 +5504,6 @@ msgstr "_Tyyppi:"
 #~ msgid "%s Network"
 #~ msgstr "%s-verkko"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "Ensisijainen DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Toissijainen DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Kolmas DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "_Tallenna…"
 
@@ -5092,12 +5535,6 @@ msgstr "_Tyyppi:"
 #~ msgid "Don't _warn me again"
 #~ msgstr "_Älä varoita uudelleen"
 
-#~ msgid "No"
-#~ msgstr "Ei"
-
-#~ msgid "Yes"
-#~ msgstr "Kyllä"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Langattomat verkot (%s)"
 
@@ -5137,12 +5574,6 @@ msgstr "_Tyyppi:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Langaton yhteys %d"
 
-#~ msgid "_Import"
-#~ msgstr "_Tuo"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Yhdistä _automaattisesti"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Saatavilla kaikille käyttäjille"
 
diff --git a/po/fr.po b/po/fr.po
index ceca64fe..2780e378 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,9 +16,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-12-06 09:38+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-01-15 14:51+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French TEAM <gnomefr@traduc.org>\n"
@@ -28,48 +28,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Réseau"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Gérer vos connexions réseau"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 msgid "Advanced Network Configuration"
 msgstr "Configuration réseau avancée"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gérer et modifier les paramètres des connexions réseau"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Désactiver les notifications de connexion"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
 "la connexion à un réseau."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Désactiver les notifications de déconnexion"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
 "la déconnexion d'un réseau."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Désactiver les notifications VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -77,53 +86,54 @@ msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
 "la connexion ou déconnexion à un VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Désactiver les notifications de disponibilité de réseaux sans fil"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les notifications lors de "
 "la disponibilité de réseaux Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Marque"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Sert à déterminer si les paramètres doivent être migrés dans une nouvelle "
 "version."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Désactiver la création Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver la création de réseau "
 "adhoc lors de l'utilisation de l'applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Afficher l'applet dans la zone de notification"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Définir ce paramètre à faux (false) pour désactiver l'affichage de l'applet "
 "dans la zone de notification."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorer le certificat de CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -131,7 +141,7 @@ msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les avertissements à "
 "propos des certificats CA dans l'authentification EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -139,15 +149,15 @@ msgstr ""
 "Définir ce paramètre à vrai (true) pour désactiver les avertissements à "
 "propos des certificats CA dans la phase 2 de l'authentification EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Éditeur de connexion NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -155,7 +165,7 @@ msgstr ""
 "NetworkManager est un service système de gestion et de configuration de vos "
 "connexions et périphériques réseau."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -163,23 +173,23 @@ msgstr ""
 "Le programme nm-connection-editor fonctionne avec NetworkManager pour créer "
 "et éditer les profils de connexions de NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Les développeurs de NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "la classe d'objet « %s » n'a pas de propriété nommée « %s »"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "la propriété « %s » de la classe d'objet « %s » n'est pas accessible en "
 "écriture"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -187,21 +197,21 @@ msgstr ""
 "la propriété de construction « %s » pour l'objet « %s » ne peut pas être "
 "définie après la construction"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "« %s::%s » n'est pas un nom de propriété valide ; « %s » n'est pas un sous-"
 "type GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "impossible de définir la propriété « %s » de type « %s » depuis une valeur "
 "de type « %s »"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -210,81 +220,80 @@ msgstr ""
 "la valeur « %s » de type « %s » est invalide ou hors de la plage pour la "
 "propriété « %s » de type « %s »"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Authentification 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1097
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1103
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Se _connecter"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nom du réseau"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sécurisé."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Échec de l'ajout/création de la connexion"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Échec de la connexion"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "La déconnexion du périphérique a échoué"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Échec de la déconnexion"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "L'activation de la connexion a échoué"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Ne plus afficher ce message"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +304,7 @@ msgstr ""
 "La connexion VPN « %s » a été déconnectée car la connexion réseau a été "
 "interrompue."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +314,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car la connexion réseau a été interrompue."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +324,7 @@ msgstr ""
 "La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière "
 "inattendue."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +335,7 @@ msgstr ""
 "La connexion VPN « %s » a échoué car le service VPN a renvoyé une "
 "configuration invalide."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +344,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le délai de connexion est dépassé."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -344,7 +353,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le service VPN n'a pas démarré à temps."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -353,7 +362,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +371,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car il n'y avait pas de secret VPN valide."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +380,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué en raison de secrets VPN non valides."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -380,7 +389,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -391,19 +400,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "La connexion VPN a été établie avec succès.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Message d'identification VPN"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "La connexion VPN a échoué"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -416,7 +425,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -429,563 +438,574 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "périphérique non prêt (micrologiciel manquant)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "périphérique non prêt"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "périphérique non géré"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Aucun périphérique réseau disponible"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_Connexions VPN"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configurer le VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Ajouter une connexion VPN…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager n'est pas lancé…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Réseau désactivé"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activer le _réseau"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Activer le réseau _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activer la connexion _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activer les _notifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informations sur la connexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Modifier les connexions…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Vous êtes maintenant connecté à « %s »."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "La connexion réseau a été déconnectée."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Préparation de la connexion réseau « %s »…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Authentification nécessaire pour la connexion réseau « %s »…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Obtention d'une adresse réseau pour « %s »…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Connexion réseau « %s » active"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Démarrage de la connexion VPN « %s »…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Authentification nécessaire pour la connexion VPN « %s »…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Obtention d'une adresse VPN pour « %s »…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Connexion VPN active"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Aucune connexion réseau"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Code PUK erroné ; contactez votre fournisseur."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Code PIN erroné ; contactez votre fournisseur."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Envoi du code de déverrouillage…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Connexion mobile (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Connexion mobile"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Nouvelle connexion mobile…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Connexion établie"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Vous êtes maintenant connecté au réseau mobile."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Réseau mobile."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Vous êtes maintenant enregistré sur le réseau domestique."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Vous êtes maintenant enregistré sur un réseau itinérant."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Vous êtes maintenant connecté au réseau mobile."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Préparation de la connexion mobile « %s »…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configuration de la connexion mobile « %s »…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Authentification personnelle nécessaire pour la connexion mobile « %s »…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Connexion mobile « %s » active"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatique"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Réseaux Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Réseau Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Réseaux Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Réseau Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Vous êtes maintenant connecté au réseau Ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Préparation de la connexion au réseau Ethernet « %s »…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configuration de la connexion au réseau Ethernet « %s »…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Authentification nécessaire pour la connexion au réseau Ethernet « %s »…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Obtention d'une adresse de réseau Ethernet pour « %s »…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Connexion au réseau Ethernet « %s » active"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Authentification DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Se _connecter à un réseau Wi-Fi invisible…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Créer un _nouveau réseau Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "L'ajout de la nouvelle connexion a échoué"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Privilèges insuffisants."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Réseaux Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Réseau Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Réseau Wi-Fi"
 msgstr[1] "Réseaux Wi-Fi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "le Wi-Fi est désactivé"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "le Wi-Fi est désactivé par un commutateur matériel"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Plus de réseaux"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Réseaux Wi-Fi disponibles"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilisez le menu réseau pour vous connecter à un réseau Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Vous êtes maintenant connecté au réseau Wi-Fi « %s »."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Préparation de la connexion réseau Wi-Fi « %s »…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configuration de la connexion au réseau Wi-Fi « %s »…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi « %s »…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Obtention d'une adresse réseau Wi-Fi pour « %s »…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Connexion au réseau Wi-Fi « %s » active : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Connexion au réseau Wi-Fi « %s » active"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "L'activation de la connexion a échoué"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Erreur lors de l'affichage des informations de connexion :"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:968 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dynamique"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Plus d'adresses"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (par défaut)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Inconnue"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adresse IP "
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresse de broadcast "
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Masque de sous-réseau "
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Principal"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Mot de passe _secondaire :"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Général"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface "
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adresse matérielle "
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Pilote "
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Vitesse "
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sécurité :"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Route par défaut "
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignoré"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Mot de passe :"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Type de VPN "
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Passerelle pour le VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nom d'utilisateur pour le VPN "
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Bannière pour le VPN "
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Connexion de base "
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Inconnue"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Aucune connexion valide active trouvée !"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -995,18 +1015,18 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "et beaucoup d'autres contributeurs et traducteurs de la communauté"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Une zone de notification pour gérer vos périphériques réseaux et vos "
 "connexions."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Site Web de NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Raphaël Tournoy <lexpas@free.fr>\n"
@@ -1020,7 +1040,7 @@ msgstr ""
 "Alain Lojewski <allomervan@gmail.com>\n"
 "Yvan Masson <yvan.masson@openmailbox.org>"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1028,33 +1048,33 @@ msgstr ""
 "L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
 "fichier .ui n'a pas été trouvé)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Ressources manquantes"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mot de passe du réseau mobile"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Un mot de passe est requis pour se connecter à « %s »."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Déverrouillage SIM PIN requis"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Déverrouillage SIM PIN requis"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1064,25 +1084,25 @@ msgstr ""
 "utilisé."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Code PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Afficher le code PIN"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Déverrouillage SIM PUK requis"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Déverrouillage SIM PUK requis"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1092,42 +1112,42 @@ msgstr ""
 "utilisé."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Code PUK :"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nouveau code PIN :"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Resaisissez le nouveau code PIN :"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Afficher les codes PIN/PUK"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "La connexion n'avait pas de réglage VPN"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Échec d'écriture de la connexion vers l'interface VPN : %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Échec d'écriture de la connexion vers l'interface VPN : écriture incomplète"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1135,41 +1155,41 @@ msgstr ""
 "Les adresses IP identifient votre ordinateur sur le réseau. Cliquez sur le "
 "bouton « Ajouter » pour ajouter une adresse IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norer automatiquement les routes obtenues"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Utiliser cette connexion uniquement pour les ressources de son réseau"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1177,15 +1197,15 @@ msgstr ""
 "Si activé, cette connexion ne sera jamais utilisée comme connexion réseau "
 "par défaut."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "C_réer…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Sélectionner un type de connexion"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1197,84 +1217,93 @@ msgstr ""
 "Si vous créez un VPN et qu'il n'apparaît pas dans la liste, il se peut que "
 "vous n'ayez pas le bon greffon VPN installé."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Périphérique"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Circulaire"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Sauvegarde active"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Équilibrage adaptatif de charge de transmission"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Équilibrage adaptatif de charge"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recommandé)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "_Connexions liées"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "M_ode"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Modifier"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "_Fréquence de contrôle"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Nom de l'interface"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "Contrôle du _lien"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "Cibl_es ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1282,19 +1311,19 @@ msgstr ""
 "Une adresse IP, ou une liste d'adresses IP séparées par des virgules, à "
 "rechercher lors de la vérification du statut du lien."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Délai de c_onnexion"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Délai de _déconnexion"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Principal"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1302,66 +1331,69 @@ msgstr ""
 "Le nom d'interface du périphérique principal. Si défini, ce périphérique "
 "sera toujours l'esclave actif lorsqu'il est disponible."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 msgstr "MT_U"
 
-#: ../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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "octets"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "_Coût de la liaison"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Priorité"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "Mode en épin_gle"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Pon_t entre connexions"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Dél_ai d'acheminement"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "Délai _hello"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Délai de propagation STP, en secondes"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Temps hello STP, en secondes"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Activer le snooping I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1372,16 +1404,16 @@ msgstr ""
 "d’empreintes, le système peut refuser d’activer la fonctionnalité tant que "
 "les collisions ne sont pas réglées."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activer _STP (protocole Spanning Tree)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr "Contrôle si le protocole Spanning Tree (STP) est activé pour ce pont"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1389,27 +1421,27 @@ msgstr ""
 "La priorité STP pour ce pont. Les valeurs basses sont « meilleures » ; le "
 "pont à la priorité la plus basse sera élu comme pont racine."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Durée maximum"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Àge maximum du message STP, en secondes"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "_Durée de vie"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Durée de vie de l'adresse MAC Ethernet, en secondes"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Masque de _propagation de groupe"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1421,40 +1453,40 @@ msgstr ""
 "bits 0, 1 et 2 du masque ne peuvent être définis car ils sont utilisés par "
 "STP, les trames de pause MAC et LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatique"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "par défaut"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "erreur inconnue"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Conserver"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Permanente"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stable"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1465,183 +1497,226 @@ msgstr ""
 "fonctionnalité est connue sous le nom de clonage ou usurpation MAC. "
 "Exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Adresse MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Adresse matérielle"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s invalide pour %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s invalide (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "nom d'interface invalide pour %s (%s) : "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nom d'interface invalide (%s) : "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "impossible d'analyser le nom de périphérique"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "adresse matérielle non valide"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "%s invalide (%s) : "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "périphérique"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "%s invalide (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Utiliser Data Center Bridging (DCB) pour cette connexion"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Contrôle du flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Fonction"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Activer"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Publier"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Consentent"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Options…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Groupes de priorités"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Contrôle du flux des priorités"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Active ou désactive la transmission d'une pause de priorité pour chaque "
 "priorité utilisateur."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Classe de trafic"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Bande passante stricte"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Bande passante prioritaire"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Bande passante de groupe"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Identifiant du groupe"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Saisissez l'identifiant du groupe de priorités pour chaque priorité "
 "utilisateur."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1650,36 +1725,36 @@ msgstr ""
 "peut utiliser pour la liaison. La somme allouée à tous les groupes doit "
 "faire 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Saisissez le pourcentage de bande passante du groupe de priorités que chaque "
 "priorité utilisateur peut utiliser."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Activez ou désactivez la bande passante stricte de chaque priorité "
 "utilisateur."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Saisissez la classe de trafic pour chaque priorité utilisateur."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "Nom d’_utilisateur"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Nom d’utilisateur utilisé pour s’authentifier au service PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1688,53 +1763,51 @@ msgstr ""
 "service indiqué. Pour la plupart des fournisseurs, ceci devrait être laissé "
 "vide."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Service"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "A_fficher le mot de passe"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Mot de passe utilisé pour s’authentifier au service PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "_Interface PPP"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "Interface p_arente"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Un nom arbitraire à donner à l’interface PPP nouvellement créée."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "L’interface sur laquelle la connexion PPP sera établie."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "Réc_lamer l’interface"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1747,138 +1820,131 @@ msgstr ""
 "nm-applet n'est en mesure d'activer une connexion que si cette option est "
 "cochée."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Paire torsadée (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Half"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Full"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Périphérique"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "Adresse _MAC clonée"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Wake on LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Par dé_faut"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_ARP"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gique"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "Mot de passe _Wake on LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Mot de passe Wake on LAN (une adresse MAC Ethernet). Cela n'est valable que "
 "pour les paquets magiques."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Né_gociation de lien"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1889,11 +1955,11 @@ msgstr ""
 "du périphérique. Si vous n'êtes pas sûr, laissez « Ignorer » ou choisissez "
 "« Automatique »."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Vitesse"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1903,11 +1969,11 @@ msgstr ""
 "options « Ignorer » et « Automatique » ne sont pas sélectionnées. Avant de "
 "spécifier une vitesse, vérifiez que votre périphérique la prend en charge."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1918,31 +1984,31 @@ msgstr ""
 "Avant de spécifier un mode de duplex, vérifiez que votre périphérique le "
 "prend en charge."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Non"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Tous les _utilisateurs peuvent se connecter à ce réseau"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Se connecter automatiquement au _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "_Zone du pare-feu"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "Connexions li_mitées"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1955,11 +2021,11 @@ msgstr ""
 "utiliser une valeur par défaut basée sur le type de connexion et d'autres "
 "heuristiques."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Se connecter _automatiquement avec priorité"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1969,7 +2035,7 @@ msgstr ""
 "les plus grands nombres seront préférées lors de la sélection de profils "
 "d'activation automatique. La valeur par défaut est 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1978,7 +2044,7 @@ msgstr ""
 "bouton « Ajouter » pour ajouter une adresse IP statique en plus de celle "
 "assignée automatiquement."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1990,126 +2056,125 @@ msgstr ""
 "« Ajouter » pour ajouter une adresse IP. Si aucune adresse n'est fournie, la "
 "plage sera déterminée automatiquement."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Adresse statique supplémentaire"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresses"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adresse (optionnel)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagramme"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "Mode de _transport"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Nom du périphérique"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Périphérique parent"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Mode"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "IP locale"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "IP distante"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Clé d’entrée"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Clé de sortie"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatique avec paramétrage manuel du DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Lien-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:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Partagé avec d'autres ordinateurs"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Méthode"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2119,8 +2184,8 @@ msgstr ""
 "personnaliser la configuration de votre ordinateur. Si vous souhaitez "
 "utiliser un identifiant de client DHCP, ajoutez-le ici."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2128,25 +2193,23 @@ msgstr ""
 "Domaines utilisés lors de la résolution des noms d'hôtes. Utilisez des "
 "virgules pour séparer plusieurs domaines."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "ID de client D_HCP"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "Do_maines de recherche"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "Ser_veurs DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2154,11 +2217,11 @@ msgstr ""
 "Adresses IP des serveurs DNS utilisées pour la résolution des noms d'hôtes. "
 "Utilisez des virgules pour séparer plusieurs adresses DNS."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Requiert un adressage IPv_4 pour que cette connexion fonctionne"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2167,34 +2230,34 @@ msgstr ""
 "de fonctionner lorsque la configuration IPv6 est réussie, même si la "
 "configuration IPv4 échoue."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Activé (adresse publique préférée)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Activé (adresse temporaire préférée)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Confidentialité stable"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2204,19 +2267,19 @@ msgstr ""
 "Utilisez des virgules pour séparer plusieurs adresses DNS. Les adresses de "
 "lien local seront automatiquement liées à l'interface de connexion."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "Extensions de confidentialité IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "Mode de _génération d’adresse IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requiert un adressage IPv_6 pour que cette connexion fonctionne"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2225,28 +2288,28 @@ msgstr ""
 "de fonctionner lorsque la configuration IPv4 est réussie, même si la "
 "configuration IPv6 échoue."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Contrôle"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Strict"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Le nom du périphérique MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2254,7 +2317,7 @@ msgstr ""
 "Le nom d'interface parente ou l'UUID de connexion parente à partir de "
 "laquelle cette interface MACSEC doit être créée."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2262,15 +2325,15 @@ msgstr ""
 "Le nom d'interface parente ou l'UUID de connexion parente à partir de "
 "laquelle cette interface MACSEC doit être créée"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Le nom de clé pré-partagée d'association de connectivité"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "La clé pré-partagée d'association de connectivité"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2280,205 +2343,205 @@ msgstr ""
 "(accord de clé MACsec) est obtenue. Pour le mode EAP, complétez les "
 "paramètres dans la page de sécurité 802.1x"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Clés"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Validation"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "Port SCI"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Indique le mode de validation pour les trames entrantes"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Indique si le trafic transmis doit être chiffré"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Le composant de port du canal SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Basique"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "N_ombre"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Identifiant rés_eau"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Modifier…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Autoriser l'itiné_rance si le réseau domestique est indisponible"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:441
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "A_fficher les mots de passe"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Méthodes autorisées"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurer les _méthodes…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Utiliser le chiffrement Point-to-Point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Nécessite un chiffrement 128 bits"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Utiliser le MPPE avec é_tat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permettre la compression de données _BSD"
 
 # Deflate is a lossless data compression algorithm
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permettre la compression de données « _Deflate »"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Utiliser la compression des _en-têtes TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Écho"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Envoyer les pa_quets d'écho PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Pour navigateur uniquement"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Utiliser cette configuration de proxy seulement pour les clients/protocoles "
 "de navigateur."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "URL de PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "Script de PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 "URL à laquelle le script de configuration automatique du proxy doit être "
 "obtenu."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importer le script à partir d'un fichier…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Méthode"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "A_vancé…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Défini par le maître"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "État du port Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Options d'équipe avancées"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "ID de _file"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2486,20 +2549,20 @@ msgstr ""
 "Nombre de rafales de NA non sollicités et de paquets ARP gratuits envoyés "
 "après que le port a été activé ou désactivé."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID de la file auprès de laquelle ce port doit être associé."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Options d'exécuteur de sauvegarde active"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "Priorité du _port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2507,32 +2570,32 @@ msgstr ""
 "La valeur est un nombre positif en millisecondes. Il spécifie l'intervalle "
 "entre les échanges de paquets notify-peer."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Priorité du port. Un nombre élevé signifie une plus grande priorité."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _tenace"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr "Ne pas désélectionner le port si un meilleur devient disponible."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Options d'exécuteur LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "Priorité de port _LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "_Clé de port LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2540,7 +2603,7 @@ msgstr ""
 "Nombre d'échanges de requêtes de participation aux groupes multicast envoyés "
 "après que le port a été activé ou désactivé."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2548,8 +2611,8 @@ msgstr ""
 "Priorité de port selon le standard LACP. Un petit nombre signifie une "
 "priorité élevée."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2557,7 +2620,7 @@ msgstr ""
 "La valeur est un nombre positif en millisecondes. Spécifie un intervalle "
 "entre les échanges de requêtes de participation aux groupes multicast."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2565,48 +2628,48 @@ msgstr ""
 "Clé de port selon le standard LACP. Il est uniquement possible d'agréger des "
 "ports ayant la même clé."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "Surveillant de _lien"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Délai de c_onnexion"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Délai de _déconnexion"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "_Intervalle d'émission"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Délai a_vant la première émission"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "Nombre _maximum de réponses manquantes"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "Hôte _source"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "Hôte _cible"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2614,8 +2677,8 @@ msgstr ""
 "Nombre maximum de réponses manquantes. Si ce nombre est dépassé, le lien est "
 "considéré comme tombé."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2623,8 +2686,8 @@ msgstr ""
 "Nom d'hôte à convertir en adresse IP et qui sera utilisé comme adresse "
 "source dans la requête ARP."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2632,13 +2695,13 @@ msgstr ""
 "Nom d'hôte à convertir en adresse IP et qui sera utilisé comme adresse de "
 "destination dans la requête."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignorer les paquets invalides sur les ports _actifs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2646,13 +2709,13 @@ msgstr ""
 "Valider les paquets ARP reçus sur les ports actifs. Si ceci n'est pas coché, "
 "tous les paquets ARP entrants seront considérés comme des réponses valides."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignorer les paquets invalides sur les ports i_nactifs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2661,13 +2724,13 @@ msgstr ""
 "coché, tous les paquets ARP entrants seront considérés comme des réponses "
 "valides."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "_Envoyer sur les ports inactifs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2675,163 +2738,162 @@ msgstr ""
 "Par défaut, les requêtes ARP sont envoyées uniquement sur les ports actifs. "
 "Cette option permet de les envoyer sur les ports inactifs également."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
 "Délai entre l'établissement du lien et la notification de cet évènement à "
 "l'exécuteur."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
 "Délai entre l'interruption du lien et la notification de cet évènement à "
 "l'exécuteur."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "L'intervalle entre l'envoi de chaque requête."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Délai entre l'initialisation de la surveillance des liens et l'envoi de la "
 "première requête."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Le surveillant de lien à utiliser."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Surveillant de lien"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_porter une configuration en équipe à partir d'un fichier…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Éditer la configuration _JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Configuration brute"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Priorité la plus haute"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Priorité la plus haute (stable)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Bande passante "
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Plus grand nombre de ports"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Priorité du port"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Depuis le périphérique en équipe"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Depuis le port actif"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Depuis le périphérique actif vers le périphérique en équipe"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "_Connexions en équipe"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Répartition de charge"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "N'importe quel protocole de couche 3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "N'importe quel protocole de couche 4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Compteur de notification du _pair"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Intervalle de _notification du pair"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "Compteur de reconnexion _multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "Intervalle de _reconnexion multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "Adresse _matérielle"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2839,19 +2901,19 @@ msgstr ""
 "Adresse matérielle souhaitée pour le nouveau périphérique en équipe. Le "
 "format d'adresse MAC habituel est accepté."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "E_xécuteur"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Règle d'adresse _matérielle"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Nom de l'exécuteur à utiliser."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2860,11 +2922,11 @@ msgstr ""
 "périphériques en équipe et des périphériques de port pendant la durée de vie "
 "des équipes."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Envoyer _périodiquement des trames LACPDU"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2872,11 +2934,11 @@ msgstr ""
 "Si cochée, les trames LACPDU seront envoyées périodiquement sur les liens "
 "configurés. Sinon, elles seront envoyées uniquement en réponse."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "_Envoyer une trame LACPDU toutes les secondes"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2886,23 +2948,23 @@ msgstr ""
 "transmettre les paquets LACPDU. Si cochée, les paquets seront envoyés une "
 "fois par seconde. Sinon, il seront transmis toutes les 30 secondes."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "Priorité du _système"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "Ports _minimums"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Règle de sélection d'_agrégation"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Priorité du système, la valeur doit être comprise entre 0 et 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2911,11 +2973,11 @@ msgstr ""
 "la porteuse dans l'interface maître. La valeur doit être comprise entre 1 et "
 "255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Sélectionne la règle de sélection des agrégateurs."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2923,184 +2985,180 @@ msgstr ""
 "Liste de types de fragments (chaînes) devant être utilisés pour le calcul de "
 "l'empreinte des paquets Tx."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Champs pour l'empreinte de transmission"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "En dixièmes de seconde. Intervalle périodique entre les rééquilibrages."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Nom du balanceur Tx actif. La balance Tx active est désactivée par défaut."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Intervalle de _répartition de transmission"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Répartiteur de _transmission"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Exécuteur"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "Interface _parente"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "_Nom de l'interface VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Adresse MA_C clonée"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "Ident_ifiant VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Trier les en-têtes"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "Liaison _faible"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Numéro + du nom du périphérique"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "« vlan » + numéro"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Séc_urité"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Client"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "P_uissance de transmission"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Taux"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Canal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Ban_de"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Aucune autorisation polkit pour effectuer l'action"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Méthodes d'authentification autorisées"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3109,99 +3167,95 @@ msgstr ""
 "charge toutes les méthodes d'authentification. Si la connexion échoue, "
 "essayez d'en désactiver certaines."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Lien"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "En équipe"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "Tunnel IP"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Aucun type de service VPN."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "Le greffon VPN n'a pas réussi à importer correctement la connexion VPN : "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Sélectionnez le fichier à importer"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importer une configuration VPN enregistrée…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3209,84 +3263,82 @@ msgstr ""
 "La fenêtre d'édition de connexion n'a pas pu être initialisée en raison "
 "d'une erreur inconnue."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Impossible de créer une nouvelle connexion"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "La suppression de la connexion a échoué"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Voulez-vous vraiment supprimer la connexion %s ?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Nouvelle connexion"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Masque de réseau"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Passerelle"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Métrique"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Préfixe"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Modification de %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Modification de la connexion anonyme"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Nom de la connexion manquant"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Initialisation de l'éditeur…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "La connexion ne peut pas être modifiée"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Paramètre %s invalide : %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3294,35 +3346,35 @@ msgstr ""
 "L'éditeur de connexion n'a pas pu trouver les ressources requises (le "
 "fichier .ui n'a pas été trouvé)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Enregistrer toute modification apportée à cette connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "S'authentifier pour enregistrer cette connexion pour tous les utilisateurs "
 "de cet ordinateur."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Impossible de créer une connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Impossible de modifier la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Erreur inconnue lors de la création de la fenêtre d'édition de connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3330,19 +3382,19 @@ msgstr ""
 "Avertissement : la connexion contient des propriétés non prises en charge "
 "par l'éditeur. Elles seront supprimées au moment de l'enregistrement."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Erreur lors de l'initialisation de l'éditeur"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "L'ajout de la connexion a échoué"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Corriger"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3350,23 +3402,23 @@ msgstr ""
 "Les étiquettes de sécurité peuvent empêcher certains fichiers d'être "
 "utilisés avec l'authentification par certificat."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "_Nom de la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Exporter…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Ré-étiquetage de fichier"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Ré-étiqueter"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3374,210 +3426,209 @@ msgstr ""
 "Les fichiers suivants ne sont pas étiquetés pour être utilisés avec "
 "l'authentification par certificat. Souhaitez-vous ajuster les étiquettes ?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Ré-étiqueter"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "jamais"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "maintenant"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "il y a %d minute"
 msgstr[1] "il y a %d minutes"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "il y a %d heure"
 msgstr[1] "il y a %d heures"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "il y a %d jour"
 msgstr[1] "il y a %d jours"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "il y a %d mois"
 msgstr[1] "il y a %d mois"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "il y a %d an"
 msgstr[1] "il y a %d ans"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "La connexion ne peut pas être supprimée"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Choisissez une connexion à modifier"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Choisissez une connexion à supprimer"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Dernière utilisation"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Modifie la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "S'authentifier pour modifier la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Supprime la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "S'authentifier pour supprimer la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Type de connexion non reconnu"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "La méthode pour importer des connexions « %s » est inconnue"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Erreur lors de l'importation de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Erreur lors de la création de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Le type de connexion n'est pas défini."
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Aucun greffon VPN n'est installé."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "La méthode pour créer des connexions « %s » est inconnue"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Erreur lors de la modification de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "La connexion avec l'UUID « %s » n'a pas été trouvée"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "Connexions réseau"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Ajouter une nouvelle connexion"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Sécurité 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Impossible de charger l'interface utilisateur de sécurité 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Utiliser la sécurité 802.1_X pour cette connexion"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Adresse MAC du périphérique Bluetooth. Exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Impossible de charger l'interface utilisateur du Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "périphérique Bluetooth invalide (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Connexion Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Type de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Sélectionner le type de profil de connexion Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Réseau de zone _personnel"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Réseau par ligne commutée"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Impossible de charger l'interface utilisateur du lien."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "principal"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexion lien %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Impossible de charger l'interface utilisateur du pont."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion pont %d"
@@ -3585,36 +3636,36 @@ msgstr "Connexion pont %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port du pont"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Impossible de charger l'interface utilisateur du port de pont."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Impossible de charger l'interface utilisateur DCB."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Impossible de charger l'interface utilisateur DSL."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "interface parente manquante"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3625,41 +3676,40 @@ msgstr ""
 "les deux. Exemples : « em1 », « 3C:97:0E:42:1A:19 », "
 "« em1 (3C:97:0E:42:1A:19) »"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ignoré"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Impossible de charger l'interface utilisateur Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Périphérique Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "Adresse MAC clonée"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Mot de passe Wake on LAN"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexion Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3670,11 +3720,11 @@ msgstr ""
 "par défaut paramétrée dans le pare-feu. Cela n'est utilisable que si "
 "FirewallD est activé."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Impossible de charger l'interface utilisateur principale."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3687,167 +3737,159 @@ msgstr ""
 "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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossible de charger l'interface utilisateur InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "périphérique infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexion InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Impossible de charger l'interface utilisateur de tunnel IP."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Connexion tunnel IP %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatique (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Adresses automatiques uniquement (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatique, adresses uniquement"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatique (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Adresses automatiques uniquement (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatique (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Adresses automatiques uniquement (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Lien-local uniquement"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Ser_veurs DNS supplémentaires"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Do_maines de recherche supplémentaires"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modification des routes IPv4 pour %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Paramètres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Impossible de charger l'interface utilisateur IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Adresse IPv4 « %s » invalide"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Masque de sous-réseau IPv4 « %s » invalide"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Passerelle IPv4 « %s » invalide"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Serveur DNS IPv4 « %s » invalide"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatique, DHCP uniquement"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modification des routes IPv6 pour %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Paramètres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Impossible de charger l'interface utilisateur IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Adresse IPv6 « %s » invalide"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Préfixe IPv6 « %s » invalide"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Passerelle IPv6 « %s » invalide"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Serveur DNS IPv6 « %s » invalide"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Impossible de charger l'interface utilisateur MACsec."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "Connexion MACSEC %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Esclaves dupliqués"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 "Les esclaves « %s » et « %s » s'appliquent tous deux au périphérique « %s »"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3856,25 +3898,25 @@ msgstr ""
 "Les esclaves « %s » et « %s » s'appliquent à des ports virtuels différents "
 "(« %s » et « %s ») du même périphérique physique."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "Esclave %s %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Impossible de charger l'interface utilisateur de la connexion mobile."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Type de connexion mobile non pris en charge."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Sélection du type de fournisseur de connexion mobile"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3882,7 +3924,7 @@ msgstr ""
 "Sélectionnez la technologie utilisée par votre fournisseur de connexion "
 "mobile. En cas de doute, interrogez votre fournisseur."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mon fournisseur utilise une technologie de type _GSM (GPRS, EDGE, UMTS, "
@@ -3890,81 +3932,79 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "aucune"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Modification des méthodes d'authentification PPP pour %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Paramètres PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Impossible de charger l'interface utilisateur PPP."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Impossible de charger l'interface utilisateur de proxy."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Erreur : le fichier ne contient pas de configuration JSON valide"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Impossible de charger l'interface utilisateur de connexion en équipe."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion en équipe %d"
@@ -3972,68 +4012,67 @@ msgstr "Connexion en équipe %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port d'équipe"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Impossible de charger l'interface utilisateur du port d'équipe."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via « %s »)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Nouvelle connexion…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Impossible de charger l'interface utilisateur VLAN."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "parent du VLAN"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexion VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Impossible de charger le greffon d'édition VPN pour « %s » (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "échec inconnu"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Impossible de charger l'interface utilisateur VPN."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Impossible de trouver le greffon VPN pour « %s »."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexion VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Sélectionner un type de connexion VPN"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -4043,7 +4082,7 @@ msgstr ""
 "connexion. Si le type de connexion VPN n'apparaît pas dans la liste, il est "
 "possible que vous n'ayez pas le bon greffon VPN installé."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4051,7 +4090,7 @@ msgstr ""
 "Cette option verrouille cette connexion sur le point d'accès (PA) Wi-Fi "
 "spécifié par le BSSID saisi ici. Par exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4062,97 +4101,95 @@ msgstr ""
 "les deux. Exemples : « wlan0 », « 3C:97:0E:42:1A:19 », « wlan0 "
 "(3C:97:0E:42:1A:19) »"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Impossible de charger l'interface utilisateur Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "BSSID"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Périphérique Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:942 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clé WEP 40/128-bit (Hex ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit à phrase secrète"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dynamique (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:995 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 personnel"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1013 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 entreprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Impossible de charger l'interface utilisateur de sécurité Wi-Fi ; paramètre "
 "Wi-Fi manquant."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Sécurité Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Impossible de charger l'interface utilisateur de sécurité Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "SSID manquant"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Sécurité incompatible avec le mode Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Un fichier nommé « %s » existe déjà."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Voulez-vous remplacer %s par la connexion VPN que vous êtes en train "
 "d'enregistrer ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Impossible d'exporter la connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4163,116 +4200,103 @@ msgstr ""
 "\n"
 "Erreur : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Exporter la connexion VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Déverrouiller"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Déverrouiller automatiquement ce périphérique"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informations sur la connexion"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Connexions réseau actives"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Aucun certificat défini"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Aucune clé définie"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Choisissez une clé pour le certificat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "_Clé privée %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "_Mot de passe de la clé %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Choisissez le certificat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "_Certificat %s"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mon pays n'est pas dans la liste"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Pas dans la liste"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mon forfait ne figure pas dans la liste…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Pays ou région"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Périphérique GSM installé"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Périphérique CDMA installé"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "N'importe quel appareil"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nouvelle connexion mobile"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4280,86 +4304,72 @@ msgstr ""
 "Cet assistant vous aide à configurer facilement une connexion mobile à large "
 "bande à un réseau cellulaire (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vous devez disposer des informations suivantes :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Le nom de votre fournisseur"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Le nom de votre plan de facturation"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "Le nom du point d'accès (APN) de votre plan de facturation (dans certains "
 "cas)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Créer une connexion pour cet appareil _mobile :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configuration d'une connexion mobile"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Liste des pays ou des régions :"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Pays ou région"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Choisissez le pays ou la région de votre fournisseur"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Sélectionnez votre fournisseur dans la _liste :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 "Je ne trouve pas mon fournisseur et je souhaite configurer _manuellement la "
 "connexion :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Mon fournisseur utilise la technologie GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mon fournisseur utilise la technologie CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Choisissez votre fournisseur"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Choisissez votre forfait :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Nom du point d'accès (_APN) choisi :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4372,37 +4382,31 @@ msgstr ""
 "Si vous avez des doutes sur le forfait à choisir, interrogez votre "
 "fournisseur au sujet du nom du point d'accès (APN)."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Choisissez votre plan de facturation"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Votre connexion mobile est configurée avec les paramètres suivants :"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Votre périphérique :"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Votre fournisseur :"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Votre forfait :"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4416,141 +4420,140 @@ msgstr ""
 "nouvelle fois les paramètres. Pour les modifier, choisissez « Connexions "
 "réseau » dans le menu Système > Préférences."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmation des paramètres de connexion mobile"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(aucun)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Clé dans %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certificat dans %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(inconnu)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Choisir à partir d'un fichier…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Choisissez un certificat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "_Mot de passe du certificat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Erreur de connexion :"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Erreur lors de l'ouverture d'une session : "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Déverrouiller le jeton"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Émis par"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Saisissez le PIN %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Se connecter"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "Se Suvenir du _PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Enregistrer le mot de passe seulement pour cet utilisateur"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Enregistrer le mot de passe pour tous les utilisateurs"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Demander ce mot de passe chaque fois"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Le mot de passe n'est pas nécessaire"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "A_fficher les mots de passe"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Troisième mot de passe :"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "Mot de passe _secondaire :"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Mot de passe :"
 
-#: ../src/libnma/nma-wifi-dialog.c:126 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Cliquer pour se connecter"
 
-#: ../src/libnma/nma-wifi-dialog.c:457 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Nouveau…"
 
-#: ../src/libnma/nma-wifi-dialog.c:925 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/libnma/nma-wifi-dialog.c:981 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dynamique (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1101 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../src/libnma/nma-wifi-dialog.c:1179 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4558,35 +4561,35 @@ msgstr ""
 "Des mots de passe ou des clés de chiffrement sont nécessaires pour l'accès "
 "au réseau Wi-Fi « %s »."
 
-#: ../src/libnma/nma-wifi-dialog.c:1181 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1183 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentification demandée par le réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Création d'un nouveau réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nouveau réseau Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1191 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Saisissez le nom du réseau Wi-Fi que vous voulez créer."
 
-#: ../src/libnma/nma-wifi-dialog.c:1193 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion au réseau Wi-Fi invisible"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Réseau Wi-Fi invisible"
 
-#: ../src/libnma/nma-wifi-dialog.c:1196 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4594,44 +4597,52 @@ msgstr ""
 "Saisissez le nom et les détails de sécurité du réseau Wi-Fi invisible auquel "
 "vous voulez vous connecter."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "_Sécurité Wi-Fi"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "Co_nnexion"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "Ad_aptateur Wi-Fi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr ""
 "Je ne trouve pas mon fournisseur et je souhaite le saisir _manuellement :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Fournisseur :"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Liste des pays ou des régions :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Pays ou région"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Filaire"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Maillage OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4641,13 +4652,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4656,27 +4667,27 @@ msgstr ""
 "dernier cas, vous devez d'abord éditer la connexion avec nm-connection-"
 "editor."
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "_Sécurité Wi-Fi :"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Nom du réseau :"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "Co_nnexion :"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Ad_aptateur Wi-Fi :"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4684,7 +4695,7 @@ msgstr ""
 "Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4692,336 +4703,334 @@ msgstr ""
 "Il n'est pas conçu pour interagir avec la ligne de commande, mais il "
 "s'intègre plutôt dans l'environnement de bureau GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "non activé"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "non enregistré"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Réseau domestique (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Réseau domestique"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "recherche"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "enregistrement refusé"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (itinérance %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (itinérance)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Réseau itinérant (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Réseau itinérant"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Code PIN pour carte SIM « %s » sur « %s »"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Code PIN requis"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Le code PIN est nécessaire pour la connexion mobile"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Connexion mobile « %s » active : (%d %%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "itinérance"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Connexion à %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificats PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Clés privées DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "erreur de sécurité 802.1X (WPA-EAP) indéfinie"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "aucun certificat sélectionné"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "le fichier de certificat CA n'existe pas"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "fichier EAP-FAST PAC manquant"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Choisir un fichier PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Fichier PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Authentifié"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Les deux"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Identité anony_me"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "Fichier _PAC"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "Authentification i_nterne"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermettre le provisionnement PAC automatique"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "nom d'utilisateur EAP-LEAP manquant"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "mot de passe EAP-LEAP manquant"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Aucun certificat d'AC n'est _requis"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "Version de _PEAP"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Suffixe du nom de certificat serveur."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domaine"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "nom d'utilisateur EAP manquant"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "mot de passe EAP manquant"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr "phrase de passe de clé privée cliente EAP manquante"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 msgid "P_rivate Key Passphrase"
 msgstr "Phrase de passe de clé p_rivée"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 msgid "Sh_ow passphrase"
 msgstr "A_fficher la phrase de passe"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "identité EAP-TLS manquante"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "aucun certificat utilisateur sélectionné"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "le fichier de certificat utilisateur sélectionné n'existe pas"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "aucune clé sélectionnée"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "le fichier de clé sélectionné n'existe pas"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "I_dentité"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Erreur inconnue lors de la validation de sécurité 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr "Configurée de façon externe"
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "Au_thentification"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "nom d'utilisateur LEAP manquant"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "mot de passe LEAP manquant"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "clé WEP manquante"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des "
 "chiffres hexadécimaux"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -5029,7 +5038,7 @@ msgstr ""
 "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des "
 "caractères ASCII"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5038,41 +5047,41 @@ msgstr ""
 "clé WEP invalide : longueur de clé %zu non valide. La longueur d'une clé "
 "doit être soit de 5/13 (ASCII), soit de 10/26 (hexa)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "clé WEP invalide : la phrase de passe ne peut pas être vide"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "clé WEP invalide : la phrase de passe doit avoir une taille inférieure à 64 "
 "caractères"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Système ouvert"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "À clé partagée"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (par défaut)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Clé"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "A_fficher la clé"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5081,12 +5090,21 @@ msgstr ""
 "WPA-PSK invalide : longueur de clé %zu non valide. Doit être de [8,63] "
 "octets ou 64 chiffres hexa"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "WPA-PSK invalide : impossible d'interpréter une clé de 64 octets en "
 "hexadécimal"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Type"
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (par défaut)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignoré"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Connexions réseau actives"
diff --git a/po/gd.po b/po/gd.po
index 38703ad3..bc580014 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\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"
@@ -21,49 +22,58 @@ 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:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Lìonra"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Stiùirich na ceanglaichean agad ris an eadar-lìon"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Ceanglaichean ri lìonraidhean"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Ceanglaichean lìonraidh a tha an gnìomh"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Stiùirich is atharraich roghainnean a' cheangail agad ris an lìonra"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a dhèanamh"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu ri "
 "lìonra."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Cur à comas brathan a dh'innseas gun deach ceangal a bhriseadh"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhriseas tu an "
 "ceangal ri lìonra."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Cuir à comas brathan VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -71,53 +81,54 @@ msgstr ""
 "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a cheanglas tu ri "
 "VPN no nuair a bhriseas tu an ceangal ris."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Mùch brathan mu lìonraidhean a tha ri làimh"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Tagh TRUE airson seo mur eil thu ag iarraidh brathan nuair a bhios "
 "lìonraidhean Wi-Fi ri làimh."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stampa"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Thèid seo a chleachdadh gus co-dhùnadh an dèid na roghainnean imrich gu "
 "tionndadh ùr gus nach dèid."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Cur à comas cruthachadh Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Tagh TRUE airson seo ma tha thu airson casg a chur air cruthachadh de "
 "lìonraidhean ad-hoc nuair a chleachdar an aplaid."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Seall an aplaid ann an raon nam brathan"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Tagh FALSE air a shon mur eil thu airson an aplaid fhaicinn ann an raon nam "
 "brathan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Leig seachad an teisteanas CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -125,7 +136,7 @@ msgstr ""
 "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
 "ann an dearbhadh EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -133,15 +144,15 @@ msgstr ""
 "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
 "ann an ceum 2 dhen dearbhadh EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Manaidsear lìonraidh"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Deasaiche ceanglaichean Manaidsear lìonraidh"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -149,7 +160,7 @@ msgstr ""
 "'S e seirbheis an t-siostaim a th' ann am Manaidsear lìonraidh gus na "
 "ceanglaichean is uidheaman lìonraidh agad a stiùireadh 's a rèiteachadh."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -158,105 +169,118 @@ msgstr ""
 "pròifilean ceanglaidh a chruthachadh 's a dheasachadh airson Manaidsear "
 "lìonraidh."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Luchd-leasachaidh na h-aplaid Manaidsear lìonraidh"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "S_guir dheth"
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_eangail"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Ainm an _lìonraidh:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "tèarainte."
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris/a chur an gnìomh"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Mearachd neo-aithnichte"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Dh'fhàillig an ceangal"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Cha b' urrainn dhuinn an ceangal ris an uidheam a bhriseadh"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Cha b' urrainn dhuinn an ceangal a bhriseadh"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Na seall an teachdaireachd seo a-rithist"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +291,7 @@ msgstr ""
 "Bhris an ceangal VPN \"%s\" a chionn 's gun do bhris rudeigin a-steach air "
 "a' cheangal ris an lìonra."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do bhris rudeigin a-steach "
 "air a' cheangal ris an lìonra."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do stad an t-seirbheis VPN "
 "gu h-obann."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do thill an t-seirbheis "
 "VPN rèiteachadh mì-dhligheach."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -309,7 +333,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun do dh'fhalbh an ùine air "
 "an oidhirp cheangail."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -319,7 +343,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
 "seirbheis VPN ri tìde."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +353,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
 "seirbheis VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +363,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach robh rùintean VPN "
 "dligheach ann."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +373,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun robh na rùintean VPN mì-"
 "dhligheach."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -358,7 +382,7 @@ msgstr ""
 "\n"
 "Dh'fhàillig an ceangal VPN \"%s\"."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -369,19 +393,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Chaidh an ceangal VPN a stèidheachadh.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Teachdaireachd clàradh a-steach VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Dh'fhàillig an ceangal VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -395,7 +419,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -408,319 +432,329 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "chan eil an t-uidheam deiseil (bathar-an-sàs a dhìth)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "chan eil an t-uidheam deiseil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Cuir crìoch air a' cheangal"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "chan eil an t-uidheam fo stiùireadh"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Chan eil uidheaman lìonraidh ri làimh"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_Ceanglaicheann VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Rèitich VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Cuir ris ce_angal VPN..."
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Chan eil Manaidsear lìonraidh 'na ruith..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Chaidh lìonraidhean a chur à comas"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Cuir lìonraidhean a_n comas"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Cuir an comas _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Cuir an comas bann-leathann _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Cuir an comas na _brathan"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Fiosrachadh mun cheangal"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Deasaich na ceanglaichean..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Tha thu air ceangal a dhèanamh ri \"%s\"."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Bhris an ceangal lìonraidh."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Ag ullachadh a' cheangail lìonraidh \"%s\"..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ri \"%s"
 "\"..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonraidh airson \"%s\"..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Tha an ceangal lìonraidh \"%s\" beò"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "A' tòiseachadh a' cheangail VPN \"%s\"..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 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:2622
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Ag iarraidh seòladh VPN airson \"%s\"..."
 
-#: ../src/applet.c:2625
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Tha an ceangal VPN gnìomhach"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Chan eil ceangal ris an lìonra"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplaid Manaidsear lìonraidh"
 
-#: ../src/applet-device-broadband.c:161
+#: 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:203
+#: 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:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "A' cur a' chòd a bheir a' ghlais dheth..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Bann-leathann mobile (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Bann-leathann mobile"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Ri làimh"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Ceangal bann-leathainn mobile ùr..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Chaidh ceangal a dhèanamh"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 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:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Lìonra bann-leathainn mobile."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 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:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Tha thu a-nis clàraichte air lìonra air fàrsan."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 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-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 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
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 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
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 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
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Tha an ceangal bann-leathann mobile \"%s\" gnìomhach"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet fèin-obrachail"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Lìonraidhean Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Lìonra Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Lìonraidhean Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Lìonra Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Tha thu air ceangal a dhèanamh ris an lìonra ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ag ullachadh ceangail lìonra Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "A' rèiteachadh ceangail lìonra Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 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
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonra Ethernet airson \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Tha an ceangal lìonra Ethernet \"%s\" gnìomhach"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Dearbhadh  DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_Ceart ma-thà"
+
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Ceangail ri lìonra Wi-Fi falaichte..."
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Cruthaich lìonra Wi-Fi ù_r..."
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(chan eil gin)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Cha b' urrainn dhuinn ceangal ùr a chur ris"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Lìonraidhean Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Lìonra Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Lìonra Wi-Fi"
@@ -728,242 +762,257 @@ msgstr[1] "Lìonraidhean Wi-Fi"
 msgstr[2] "Lìonraidhean Wi-Fi"
 msgstr[3] "Lìonraidhean Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Tha Wi-Fi à comas"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Chaidh am Wi-Fi a chur à comas le suidse chruaidh"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Barrachd lìonraidhean"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Lìonraidhean Wi-Fi a tha ri làimh"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 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 Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 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:1342
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Ag ullachadh ceangal lìonraidh Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "A' rèiteachadh ceangail lìonra Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 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 Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Ag iarraidh seòladh lìonra Wi-Fi airson \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Tha an ceangal lìonra Wi-Fi \"%s\" gnìomhach: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Tha an ceangal lìonra Wi-Fi \"%s\" gnìomhach"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Mearachd a' taisbeanadh fiosrachadh a' cheangal:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Barrachd sheòlaidhean"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (bun-roghainn)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Chan eil fhios dè an t-astar"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Seòladh IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Seòladh craolaidh"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnet Mask"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "A' phrìomh DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "An dàrna DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "An tritheamh DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Coitcheann"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Eadar-aghaidh"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Seòladh bathair-chruaidh"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Draibhear"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Astar"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Tèarainteachd:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 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
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Air a leigeil seachad"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Facal-faire:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Seòrsa a' VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Bealach VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Ainm-chleachdaiche VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Bratach VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Ceangal bunasach"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Cha deach ceangal gnìomhach dligheach a lorg!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -971,18 +1020,22 @@ msgstr ""
 "Còir-lethbhreac  © 2005-2008 Novell, Inc.\n"
 "agus iomadh com-pàirtiche coimhearsnachd agus eadar-theangadairean"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplaid raon nam brathan airson stiùireadh nan ceanglaichean agus uidheaman "
 "lìonraidh agad."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Làrach-lìn Manaidsear lìonraidh"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -990,33 +1043,33 @@ msgstr ""
 "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
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Goireasan a tha a dhìth"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Facail-faire lìonra bann-leathainn mobile"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 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
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Facal-faire:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 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
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1026,25 +1079,25 @@ msgstr ""
 "mobile \"%s\" mus gabh a chleachdadh."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Còd PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Seall an còd PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 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
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1054,35 +1107,42 @@ msgstr ""
 "mobile \"%s\" mus gabh a chleachdadh."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Còd PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Còd PIN ùr:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Cuir a-steach an còd PIN ùr a-rithist:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_Ceart ma-thà"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Fiosrachadh mun cheangal"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Dh'fhàillig cruthachadh a' cheangail DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1090,42 +1150,42 @@ 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-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Cuir ris"
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Sguab às"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Leig se_achad rùtaichean a fhuaras gu fèin-obrachail"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 "_Na cleachd an ceangal seo ach airson goireasan air an lìonra aige fhèin."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1133,16 +1193,16 @@ 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:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Cruthaich..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Tagh seòrsa a' cheangail"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1155,85 +1215,100 @@ msgstr ""
 "iarraidh a’ nochdadh san liosta, ‘s dòcha nach eil am plugan VPN ceart "
 "stàlaichte agad."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Ui_dheam:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Lethbhreac-glèidhidh gnìomhach"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Craoladh"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptive Transmit Load Balancing"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptive Load Balancing"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (mholamaid seo)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Ceanglaichean bannaichte:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "D_easaich"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Marasgladh an _triceid:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Ainm na h-_eadar-aghaidh:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Marasgladh a’ _cheangail:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Targaidean ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1241,19 +1316,22 @@ msgstr ""
 "Seòladh IP no liosta de sheòlaidhean IP a tha 'gan sgaradh le cromagan a "
 "chumar sùil air a shon nuair a' sgrùdar staid a' cheangail."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Dàil a' cheangail _suas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Dàil a' cheangal _a-nuas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Prìomh uidheam:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1261,103 +1339,161 @@ msgstr ""
 "Ainm eadar-aghaidh a' phrìomh uidheim. Ma tha seo suidhichte, bidh an t-"
 "uidheam seo 'na thràill ghnìomhach an-còmhnaidh nuair a bhios e ri làimh."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "baidhtean"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Cosgais na slighe:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prìomhachas:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Modh _Hairpin:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "_Ceanglaichean drochaidichte:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Dàil adhairt:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Àm _fàilteachaidh:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Cuir I_GMP snooping an comas"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Cuir an comas _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Aois as _motha:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Àm _aoiseachaidh:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: 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:121
-#: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:168
-#: ../src/connection-editor/page-wifi.c:172
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "bun-roghainn"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "mearachd nach deach a shònrachadh"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Glèidh"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Buan"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Air thuaiream"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Seasmhach"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1368,195 +1504,233 @@ msgstr ""
 "gnìomhach air. Canar clònachadh MAC no spoofing ris, mar eisimpleir "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Seòladh MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Seòladh HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: 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:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, fuzzy, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "interface-name mì-dhligheach airson %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "interface-name mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Seòladh bathair-chruaidh:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, fuzzy, c-format
 msgid "invalid %s (%s): "
 msgstr "%s mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "uidheam"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, fuzzy, c-format
 msgid "invalid %s (%s) "
 msgstr "%s mì-dhligheach (%s)"
 
-#: ../src/connection-editor/ce-page.c:725
-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 "
-"dhuinn."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Cleachd Data Center Bridging (DCB) airson a' cheangail seo."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Smachd srutha"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Feart"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Cuir an comas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Sanasaich"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Deònach"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prìomhachas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Roghainnean..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Buidhnean prìomhachais"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Smachd srutha a' phrìomhachais"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 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:20
-msgid "Priority:"
-msgstr "Prìomhachas:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Clas trafaige:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Leud-banna teann:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Prìomhachas an leud-banna:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Leud-banna a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ID a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 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:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1565,241 +1739,306 @@ msgstr ""
 "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:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 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:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 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:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Cuir a-steach an clas trafaige airson gach prìomhachas cleachdaiche."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Ainm-cleachdaiche:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Seirbheis:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Sea_ll am facal-faire"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Eadar-aghaidh"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Eadar-aghaidh _pàraint:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Eadar-aghaidh _pàraint:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Leig seachad"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "A làimh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+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:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "Dùsgadh an lìonraidh:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Bun-roghainn"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "Le_ig seachad"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Fiosaigeach"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Aon-chraoladh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Io_ma-chraoladh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Craoladh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "_Draoidheach"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "Facal-faire aig _dùsgadh an lìonraidh:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 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 e dligheach "
 "ach airson pacaidean draoidheach."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Astar:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+#, fuzzy
+msgid "Duple_x"
 msgstr "Dà-_thaobhach:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Tha"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Chan eil"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Faodaidh na _cleachdaiche uile ceangal ris an lìonra seo"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-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:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Ceangail ri _VPN gu fèin-obrachail nuair a chleachdar an ceangal seo"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "_Sòn cachaileith-theine:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Ceanglaichean sgioba:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Leig se_achad rùtaichean a fhuaras gu fèin-obrachail"
+
+#: src/connection-editor/ce-page-general.ui:167
 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
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1808,7 +2047,7 @@ 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
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1816,123 +2055,127 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Seòlaidhean"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Modh _còmhdhalach:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Dàtagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Ceangailte"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Modh _còmhdhalach:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Ainm an uidheim"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Uidheam pàraint"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Modh"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "IP ionadail"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "IP cèin"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Gu fèin-obrachail le roghainnean DNS làimhe"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Co-roinnte ri coimpiutairean eile"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Dòigh:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -1942,8 +2185,8 @@ msgstr ""
 "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:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1951,25 +2194,26 @@ 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:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID cliant D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Lorg air na _h-àrainnean-lìn:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Fri_thealaichean DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1978,11 +2222,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:15
+#: src/connection-editor/ce-page-ip4.ui:288
 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:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1991,25 +2235,35 @@ 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:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_ Rùtaichean..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "À comas"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "An comas ('s fhearr leis seòladh poblach)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "An comas ('s fhearr leis seòladh sealach)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Seasmhach"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2019,15 +2273,20 @@ 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:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Leudachain _prìobhaideachd IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 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:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2036,728 +2295,848 @@ msgstr ""
 "dhan cheangal coileanadh ma dh'fhàilligeas an rèiteachadh IPv6 ach ma thèid "
 "leis an rèiteachadh IPv4."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Meatraig"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Bunasach"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Ài_reamh:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Adhartach"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID an _lìonraidh:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Atharraich..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Ceadaich ceangal air _fàrsan mur eil lìonra dachaigh ri làimh"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Sea_ll na faclan-faire"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Dearbhadh"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Dòighean ceadaichte:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Rèitich na _dòighean..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Dùmhlachadh"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Cleachd crioptachadh Point-To-Point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Iarr crioptachadh 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Cleachd _Stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Ceadaich dùmhlachadh dàta _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Ceadaich dùmhlachadh dàta _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Cleachd dùmhlachadh _bann-cinn TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Mac-talla"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Cuir pacaidean _mac-talla PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr "Modh:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 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:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "Modh:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Adhartach..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 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
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr "_Prìomhachas a' phuirt:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prìomhachas a' phuirt:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
 msgstr "Prìomhachas a' phuirt _LACP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+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
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+#, fuzzy
+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 "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+#, fuzzy
+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 "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 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 "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+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
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Leud-banna"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Prìomhachas a' phuirt"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "O uidheam an sgioba"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Ceanglaichean sgioba:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "Seòladh bathair-c_hruaidh:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
 msgstr "Poileasaidh seòladh bathair-c_hruaidh:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+#, fuzzy
+msgid "_System priority"
 msgstr "Prìomhachas an t-_siostaim:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
-msgstr ""
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
+msgstr "Ne_art an tar-chuir:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
-msgstr ""
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
+msgstr "Ne_art an tar-chuir:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Eadar-aghaidh _pàraint:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "_Ainm na h-eadar-aghaidh VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "Seòladh MAC _clònaichte:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "ID _VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Brataich:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "Ath-seò_rsaich na bannan-cinn"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "Nasgadh fuasgai_lte"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Ainm ⁊ àireamh an uidheim"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" ⁊ àireamh"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Tèaraint_eachd:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Cliant"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Ne_art an tar-chuir:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Reat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "S_eanail:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_n:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Gun dearbhadh polkit gus an gnìomh a dhèanamh"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Dòighean dearbhaidh a tha ceadaichte"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -2766,109 +3145,98 @@ msgstr ""
 "dearbhaidh sam bith. Ma dh'fhàilligeas na ceanglaichean, feuch is cuir à "
 "comas cuid dhe na dòighean."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 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:117
-#: ../src/connection-editor/page-team.c:1153 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 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:118
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 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:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "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."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Cha b' urrainn dhuinn am faidhle \"%s\" a leughadh no chan eil fiosrachadh "
-"ceangail VPN ann a thuigeas sinn\n"
+"Cha b' urrainn dhan phlugan VPN an ceangal VPN ion-phortadh mar bu chòir\n"
 "\n"
-"Mearachd: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
-msgstr "mearachd nach aithne dhuinn"
+"Mearachd: às aonais seòrsa seirbheis VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 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
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Bathar-cruaidh"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Biortail"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Ion-phortaich rèiteachadh VPN a chaidh a shàbhaladh..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2876,77 +3244,84 @@ 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:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Cha b' urrainn dhuinn an ceangal ùr a chruthachadh"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Dh'fhàillig sguabadh às a' cheangail"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, 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:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1136
-#: ../src/connection-editor/page-ip6.c:1095
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_Ceanglaicheann VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Seòladh"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Masg-lìn"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Bealach"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: 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:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Ro-leasachan"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "A' deasachadh %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "A' deasachadh ceangal gun ainm"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Tha ainm a' cheangail a dhìth"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "A' tòiseachadh an deasaiche..."
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Cha ghabh an ceangal atharrachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Roghainn mhì-dhligheach %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2954,57 +3329,54 @@ 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:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Sàbhail"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 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:579
+#: src/connection-editor/nm-connection-editor.c:583
 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:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chruthachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a dheasachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 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:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Mearachd a' tòiseachadh an deasaiche"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Dùin"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3013,48 +3385,49 @@ msgstr ""
 "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
 "ann an dearbhadh EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Ainm a' cheangail:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "Às-p_hortaich..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 #, fuzzy
 msgid "Filename"
 msgstr "Ainm an uidheim"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "chan ann idir"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "an-dràsta"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3063,7 +3436,7 @@ msgstr[1] "%d mhionaid air ais"
 msgstr[2] "%d mionaidean air ais"
 msgstr[3] "%d mionaid air ais"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3072,7 +3445,7 @@ msgstr[1] "%d uair a thìde air ais"
 msgstr[2] "%d uairean a thìde air ais"
 msgstr[3] "%d uair a thìde air ais"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3081,7 +3454,7 @@ msgstr[1] "%d latha air ais"
 msgstr[2] "%d làithean air ais"
 msgstr[3] "%d latha air ais"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3090,7 +3463,7 @@ msgstr[1] "%d mhìos air ais"
 msgstr[2] "%d mìosan air ais"
 msgstr[3] "%d mìos air ais"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3099,126 +3472,171 @@ 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:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Cha ghabh an ceangal atharrachadh"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Ceangal sgioba %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Ceangal sgioba %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ainm"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Cleachdadh mu dheireadh"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Deasaich an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 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:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Sguab às an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 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:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Seòrsa de cheangal bann-leathainn mobile ris nach eil taic."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Chan eil fhios mar a chruthaicheas sinn ceanglaichean \"%s\""
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Mearachd a' deasachadh a' cheangail"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Mearachd a' cruthachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Cha ghabh an ceangal atharrachadh"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Cha deach plugan VPN a stàladh."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 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:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Mearachd a' deasachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 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
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Ceanglaichean ri lìonraidhean"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Cuir ris ce_angal VPN..."
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Tèarainteachd 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche tèarainteachd 802.1X a "
 "luchdadh."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Cleachd tèarainteachd 802.1_X airson a' cheangail seo."
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 "An seòladh MAC aig an inneal Bluetooth. Mar eisimpleir: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche Bluetooth a luchdadh."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "uidheam Bluetooth mì-dhligheach (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Ceangal Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Seòrsa Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 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:331
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Personal Area Network"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Lìonra _dial-up"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 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:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "prìomh-fhear"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Ceangal banntach %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 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:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Ceangal drochaide %d"
@@ -3226,34 +3644,39 @@ msgstr "Ceangal drochaide %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port drochaide"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson drochaideachadh puirt "
 "chleachdaichean a luchdadh."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche DCB a luchdadh."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 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:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Eadar-aghaidh _pàraint:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ceangal DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3264,42 +3687,41 @@ msgstr ""
 "dhiubh. Mar eisimpleir: \"em1\", \"3C:97:0E:42:1A:19\", \"em1 "
 "(3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "air a leigeil seachad"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 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:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Uidheam Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "MAC clònaichte"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Facal-faire aig dùsgadh an lìonraidh"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, 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:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3310,12 +3732,12 @@ 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:370
+#: 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
+#: 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:"
@@ -3328,158 +3750,162 @@ msgstr ""
 "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:151
+#: src/connection-editor/page-infiniband.c:148
 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:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "Uidheam InfiniBand"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Ceangal nfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Fèin-obrachail (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Seòlaidhean (VPN) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Gu fèin-obrachail, seòlaidhean a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Fèin-obrachail (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Seòlaidhean (PPPoE) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Fèin-obrachail (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Seòlaidhean (DHCP) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Link-Local a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Fri_thealaichean DNS a bharrachd:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Àrainnean-lìn l_uirg a bharrachd:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: 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:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Roghainnean IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche IPv4 a luchdadh."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Chan eil an seòladh IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Chan eil am masg-lìonraidh IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Chan eil am bealach IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Chan eil am frithealaiche DNS IPv4 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Gu fèin-obrachail, DHCP a-mhàin"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "A' deasachadh rùtaichean IPv6 airson %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Roghainnean IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Cha b' urrainn duinn eadar-aghaidh cleachdaiche IPv6 a luchdadh."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Chan eil an seòladh IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Chan eil an ro-leasachan IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Chan eil am bealach IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Chan eil am frithealaiche DNS IPv6 \"%s\" dligheach"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche WiMAX a luchdadh."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Ceangal WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Dùblaich tràillean"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 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:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3488,27 +3914,27 @@ msgstr ""
 "Tha an dà thràill \"%s\" agus \"%s\" an sàs airson puirt bhiortail eadar-"
 "dhealaichte (\"%s\" agus \"%s\") aig an aon uidheam fhiosaigeach."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s tràill %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche bann-leathainn mobile a "
 "luchdadh."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 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:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Tagh seòrsa solaraiche a' bhann-leathainn mobile"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3516,7 +3942,7 @@ 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:572
+#: src/connection-editor/page-mobile.c:569
 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. "
@@ -3524,85 +3950,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 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:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "chan eil gin"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "A' deasachadh dòighean dearbhaidh PPP airson %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Roghainnean PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche PPP a luchdadh."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 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:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Mearachd: chan eil rèiteachadh JSON dligheach am broinn an fhaidhle"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 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:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Ceangal sgioba %d"
@@ -3610,11 +4032,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:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port an sgioba"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson port sgioba a' chleachdaiche a "
@@ -3623,57 +4045,56 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (tro \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Ceangal ùr..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche VLAN a luchdadh."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "pàrant vlan"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Ceangal VLAN %d"
 
-#: ../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:113
-#, c-format
-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:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 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:123
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "mearachd nach aithne dhuinn"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche a luchdadh."
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+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:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ceangal VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Tagh seòrsa a' cheangail VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3683,16 +4104,16 @@ msgstr ""
 "Mur eil seòrsa a' cheangail VPN a tha thu airson cruthachadh san liosta, 's "
 "mathaid nach eil am plugan VPN ceart stàlaichte agad."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
-"Tha an roghainn seo a’ glasadh a' cheangal seo ris a' phuing-inntrigidh Wi-Fi "
-"(AP) a tha 'ga shònrachadh leis a' BSSID a chaidh a chur a-steach an-seo. "
+"Tha an roghainn seo a’ glasadh a' cheangal seo ris a' phuing-inntrigidh Wi-"
+"Fi (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
+#: 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”, "
@@ -3703,99 +4124,97 @@ msgstr ""
 "dhiubh. Mar eisimpleir: \"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 "
 "(3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche Wi-Fi a luchdadh."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Uidheam Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Ceangal Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 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:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 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:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamic WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Cha b' urrainn an eadar-aghaidh cleachdaiche airson tèarainteachd Wi-Fi a "
 "luchdadh; tha roghainn Wi-Fi a dhith."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Tèarainteachd Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
-"Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche airson tèarainteachd "
-"Wi-Fi a luchdadh."
+"Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche airson tèarainteachd Wi-"
+"Fi a luchdadh."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "tha SSID a dhìth"
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 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:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Tha faidhle air a bheil \"%s\" ann mar-thà."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Cuir 'na àite"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: 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:172
+#: 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:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3806,408 +4225,370 @@ msgstr ""
 "\n"
 "Mearachd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Às-phortaich ceangal VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Thoir a' ghlas dheth"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Thoir a' ghlais far an uidheim seo gu fèin-obrachail"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Fiosrachadh mun cheangal"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Ceanglaichean lìonraidh a tha an gnìomh"
+#: src/info.ui:30
+msgid "_Close"
+msgstr "_Dùin"
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Tagh teisteanas CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Iuchair phrìobhaideach"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Tagh teisteanas CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Teisteanas a' chleachdaiche:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"'S iad seo na roghainnean a tha aig a' cheangal bhann-leathann mobile agad:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Chan eil mo dhùthaich air an liosta"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "An t-uidheam agad:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr "Neo-liostaichte"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "An solaraiche agad:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
+msgstr "Chan eil am plana agam air an liosta..."
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Am plana agad:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "Solaraiche"
+
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "Uidheam GSM stàlaichte"
 
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "Uidheam CDMA  stàlaichte"
+
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Uidheam sam bith"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Ceangal bann-leathainn mobile ùr"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 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\"."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Dearbh roghainnean a' bhann-leathainn mobile"
+"Bheir an cuidiche seo cobhair dhut ceangal bann-leathainn mobile a "
+"stèidheachadh ri lìonra mobile (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
-msgstr "Neo-liostaichte"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "Feumaidh tu am fiosrachadh a leanas:"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Tagh am plana agad:"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
+msgstr "Ainm an t-solaraiche bhann-leathainn agad."
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN (Access Point Name) a' phlana a thagh thu:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr "Ainm a' phlana bhileachaidh airson a' bhann-leathainn mobile agad"
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
-"Rabhadh: Ma thaghas tu am plana cearr, dh'fhaoidte gun èirich duilgheadasan "
-"bileachaidh airson a' cheangail bhann-leathainn agad no nach urrainn dhut "
-"ceangal a dhèanamh.\n"
-"\n"
-"Mur eil thu cinnteach dè am plana a tha agad, iarr fiosrachadh mu APN a' "
-"phlana agad."
+"(uaireannan) am plana bileachadh bann-leathainn APN (Access Point Name) agad"
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Tagh am plana bileachaidh agad."
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Cruthaich ceangal airson _an uidheim bhann-leathainn mobile seo:"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
-msgstr "Chan eil am plana agam air an liosta..."
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Suidhich ceangal bann-leathainn mobile"
+
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Dùthaich no roinn-dùthcha"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+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.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Tagh an solaraiche aga o _liosta:"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-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:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 "Chan fhaic mi an solaraiche agam 's tha mi ag iarraidh a chur a-steach de "
 "lài_mh:"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Solaraiche:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 "Tha an solaraiche agam a' cleachdadh teicneolas GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Tha an solaraiche agam a' cleachdadh teicneolas CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Tagh an solaraiche agad"
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Liosta dhùthchannan no roinnean-dùthcha:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Dùthaich no roinn-dùthcha"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Chan eil mo dhùthaich air an liosta"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Tagh am plana agad:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-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.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name) a' phlana a thagh thu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "Uidheam GSM stàlaichte"
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+"Rabhadh: Ma thaghas tu am plana cearr, dh'fhaoidte gun èirich duilgheadasan "
+"bileachaidh airson a' cheangail bhann-leathainn agad no nach urrainn dhut "
+"ceangal a dhèanamh.\n"
+"\n"
+"Mur eil thu cinnteach dè am plana a tha agad, iarr fiosrachadh mu APN a' "
+"phlana agad."
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "Uidheam CDMA  stàlaichte"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Tagh am plana bileachaidh agad."
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
-"Bheir an cuidiche seo cobhair dhut ceangal bann-leathainn mobile a "
-"stèidheachadh ri lìonra mobile (3G)."
+"'S iad seo na roghainnean a tha aig a' cheangal bhann-leathann mobile agad:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "Feumaidh tu am fiosrachadh a leanas:"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "An t-uidheam agad:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
-msgstr "Ainm an t-solaraiche bhann-leathainn agad."
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "An solaraiche agad:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr "Ainm a' phlana bhileachaidh airson a' bhann-leathainn mobile agad"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Am plana agad:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
-"(uaireannan) am plana bileachadh bann-leathainn APN (Access Point Name) agad"
-
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "Cruthaich ceangal airson _an uidheim bhann-leathainn mobile seo:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Uidheam sam bith"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
-msgstr "Suidhich ceangal bann-leathainn mobile"
+"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\"."
 
-#: ../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"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Dearbh roghainnean a' bhann-leathainn mobile"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(chan eil gin)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Teisteanas C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Neo-aithnichte"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 #, fuzzy
 msgid "Cancel"
 msgstr "S_guir dheth"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Ion-phortaich sgriobt o fhaidhle..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Tagh teisteanas CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Teisteanas a' chleachdaiche:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Mearachd a' deasachadh a' cheangail"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Thoir a' ghlas dheth"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Na glèidh am facal-faire ach airson a' chleachdaiche seo"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Glèidh am facal-faire airson na h-uile cleachdaiche"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Iarr am facal-faire seo gach turas"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Chan eil feum air an fhacal-fhaire"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Facal-faire dàrnach:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Sea_ll na faclan-faire"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Treas facal-faire:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Sea_ll na faclan-faire"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Facal-faire dàrnach:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Facal-faire:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Briog airson ceangal"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-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:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Ùr..."
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 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
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_ruthaich"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4215,35 +4596,36 @@ msgstr ""
 "Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
 "cothrom air an lìonra Wi-Fi \"%s\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Tha feum air dearbhadh lìonra Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tha an lìonra Wi-Fi ag iarraidh dearbhadh"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Cruthaich lìonra Wi-Fi ùr"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Lìonra Wi-Fi ùr"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
-msgstr "Cuir a-steach ainm airson an lìonra Wi-Fi a tha thu airson cruthachadh."
+msgstr ""
+"Cuir a-steach ainm airson an lìonra Wi-Fi a tha thu airson cruthachadh."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ceangail ri lìonra Wi-Fi falaichte"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Lìonra Wi-Fi falaichte"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4251,35 +4633,56 @@ msgstr ""
 "Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh Wi-Fi "
 "fhalaichte a tha thu airson ceangal ris."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Tèarainteachd Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "C_eangal:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Adaptar Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+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:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Solaraiche:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Liosta dhùthchannan no roinnean-dùthcha:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Dùthaich no roinn-dùthcha"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Uèirichte"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4289,17 +4692,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+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/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Tèarainteachd Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Ainm an _lìonraidh:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "C_eangal:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptar Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Cleachdadh:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4307,7 +4734,7 @@ msgstr ""
 "Tha am prògram seo 'na phàirt de Manaidsear lìonraidh (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4315,356 +4742,347 @@ msgstr ""
 "Cha deach a dhealbhadh mar eadar-obrachadh command-line ach airson a ruith "
 "air deasg GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "à comas"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "gun chlàradh"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Lìonra-dachaigh (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Lìonra-dachaigh"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "'ga lorg"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "chaidh an clàradh a dhiùltadh"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s air fàrsan)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (air fàrsan)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Lìonra  air fàrsan (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Lìonra  air fàrsan"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 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
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Tha feum air còd PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Feumaidh an t-uidheam bann-leathann mobile còd PIN"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, c-format
 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
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "air fàrsan"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "ceangal %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Teisteanasan DER no PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 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:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "mearachd gun sònrachadh san tèarainteachd 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr "cha deach faidhle a thaghadh"
-
-#: ../src/wireless-security/eap-method.c:235
-#, fuzzy, c-format
-msgid "file “%s” does not exist"
-msgstr "Tha faidhle air a bheil \"%s\" ann mar-thà."
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Chan eil teisteanas CA _riatanach"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "mearachd gun sònrachadh le dearbhadh an fhaidhle eap-method"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "tha faidhle EAP-FAST PAC a dhìth"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Tagh faidhle PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC  (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "A h-uile faidhle"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Gun urra"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Dearbhaichte"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "An dà chuid"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Dearbh-aithne gun _urra"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_Faidhle PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Inner Authentication:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "tha facal-faire EAP-LEAP a dhìth"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "teisteanas EAP-PEAP CA mì-dhligheach: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-"teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr "Tagh teisteanas ùghdarras theisteanasan"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Tionndadh 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Tionndadh 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../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:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Chan eil teisteanas CA _riatanach"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Tionndadh PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "tha ainm-cleachdaiche EAP a dhìth"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "tha facal-faire EAP a dhìth"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Abairt-fhaire WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Sea_ll na faclan-faire"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "tha dearbh-aithne EAP-TLS a dhìth"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 #, fuzzy
 msgid "no key selected"
 msgstr "cha deach faidhle a thaghadh"
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Chan eil teisteanas CA _riatanach"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "D_earbh-aithne:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "teisteanas EAP-TTLS CA mì-dhligheach: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-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:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (gun EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Mearachd nach aithne dhuinn le dearbhadh na tèarainteachd 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "De_arbhadh:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "tha ainm-cleachdaiche leap a dhìth"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "tha facal-faire leap a dhìth"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "tha iuchair wep a dhìth"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, 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:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4672,7 +5090,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:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4681,42 +5099,44 @@ 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:137
+#: src/wireless-security/ws-wep-key.c:141
 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:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith nas "
 "giorra na 64 caractar"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Bun-roghainn)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Siostam fosgailte"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Iuchair cho-roinnte"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Bun-roghainn)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Iuchair:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Se_all an iuchair"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Clàr-a_mais WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4725,16 +5145,109 @@ 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:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk mì-dhligheach: cha ghabh an iuchair tuigsinn mar àireamh shia-"
 "dheicheach a tha 43 baidht a dh'fhaid"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Seòrsa:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (bun-roghainn)"
+
+#~ msgid "Ignored"
+#~ msgstr "Air a leigeil seachad"
+
+#~ 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 "
+#~ "dhuinn."
+
+#~ msgid "Priority:"
+#~ msgstr "Prìomhachas:"
+
+#~ 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 "_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"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
+
+#~ 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."
+
+#~ msgid "unknown error"
+#~ msgstr "mearachd nach aithne dhuinn"
+
+#~ msgid "no file selected"
+#~ msgstr "cha deach faidhle a thaghadh"
+
+#, fuzzy
+#~ msgid "file “%s” does not exist"
+#~ msgstr "Tha faidhle air a bheil \"%s\" ann mar-thà."
+
+#~ msgid "unspecified error validating eap-method file"
+#~ msgstr "mearachd gun sònrachadh le dearbhadh an fhaidhle eap-method"
+
+#~ msgid "invalid EAP-PEAP CA certificate: %s"
+#~ msgstr "teisteanas EAP-PEAP CA mì-dhligheach: %s"
+
+#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#~ msgstr ""
+#~ "teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh"
+
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Tagh teisteanas ùghdarras theisteanasan"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Teisteanas C_A:"
+
+#~ msgid "invalid EAP-TTLS CA certificate: %s"
+#~ msgstr "teisteanas EAP-TTLS CA mì-dhligheach: %s"
+
+#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#~ msgstr ""
+#~ "teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh"
+
 #~| msgid ""
 #~| "\n"
 #~| "The VPN connection '%s' disconnected because the VPN service stopped."
@@ -4815,30 +5328,6 @@ msgstr "_Seòrsa:"
 #~ 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"
 
@@ -5065,12 +5554,6 @@ msgstr "_Seòrsa:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Seòlaidhean (PPP) fèin-obrachail a-mhàin"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche WiMAX a luchdadh."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Ceangal WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5095,9 +5578,6 @@ msgstr "_Seòrsa:"
 #~ msgid "Error: %s"
 #~ msgstr "Mearachd: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Dh'fhàillig cruthachadh a' cheangail DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Tha fòn agad deiseil gus a chleachdadh a-nis!"
 
@@ -5140,15 +5620,6 @@ msgstr "_Seòrsa:"
 #~ msgid "%s Network"
 #~ msgstr "Lìonra %s"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "A' phrìomh DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "An dàrna DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "An tritheamh DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "_Sàbhail..."
 
@@ -5188,14 +5659,8 @@ msgstr "_Seòrsa:"
 #~ "a Certificate Authority certificate?"
 #~ msgstr ""
 #~ "Mur an cleachd thu teisteanas Certificate Authority (CA), dh'fhaoidte gun "
-#~ "ceanglar ri lìonraidhean Wi-Fi neo-thèarainte is droch-rùnach. A bheil thu "
-#~ "airson teisteanas Certificate Authority a chruthachadh an-dràsta?"
+#~ "ceanglar ri lìonraidhean Wi-Fi neo-thèarainte is droch-rùnach. A bheil "
+#~ "thu airson teisteanas Certificate Authority a chruthachadh an-dràsta?"
 
 #~ msgid "Don't _warn me again"
 #~ msgstr "Na doir dhomh _rabhadh a-rithist"
-
-#~ msgid "No"
-#~ msgstr "Chan eil"
-
-#~ msgid "Yes"
-#~ msgstr "Tha"
diff --git a/po/gl.po b/po/gl.po
index 8c112e39..920fd0b4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-07-28 11:47+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2017-07-29 21:30+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician\n"
@@ -27,49 +27,58 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3186
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rede"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Xestione as súas conexións de rede"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Conexións de rede"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Configuración sen elaborar"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Xestione e cambie as súas configuracións de conexión de rede"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desactivar as notificacións de conexión"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Estabeleza isto a certo para desactivar as notificacións ao conectarse a "
 "unha rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desactivar as notificacións de desconexión"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Estabeleza isto a certo para desactivar as notificacións ao desconectarse de "
 "unha rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Desactivar as notificacións de VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -77,53 +86,54 @@ msgstr ""
 "Estabeleza isto a certo para desactivar as notificacións ao desconectarse a "
 "unha VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Eliminar as notificacións de redes dispoñíbeis"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Estabeleza isto a certo para desactivar as notificacións cando hai redes sen "
 "fíos dispoñíbeis."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Marca de tempo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Empregado para determinar se as configuracións deberían ser migradas á nova "
 "versión."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desactivar a creación de rede sen fíos"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Estabeleza isto a certo para desactivar a creación de redes sen fíos adhoc "
 "ao usar o miniaplicativo."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Mostrar o miniaplicativo na área de notificacións"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Estabelecer a FALSE para desactivar mostrar o miniaplicativo na área de "
 "notificacións."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorar certificado AC"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -131,7 +141,7 @@ msgstr ""
 "Estabelecer isto a certo para desactivar as notificacións sobre certificados "
 "CA en autenticación EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -139,15 +149,15 @@ msgstr ""
 "Estabelecer isto a certo para desactivar as notificacións sobre certificados "
 "CA na fase 2 da autenticación EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Editor de conexións de NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -155,7 +165,7 @@ msgstr ""
 "NetworkManager é un servizo do sistema para xestionar e configurar os "
 "dispositivos e conexións de rede."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -163,21 +173,21 @@ msgstr ""
 "O programa nm-connection-editor traballa co NetworkManager para crear e "
 "editar os perfís das conexións existentes no NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Os desenvolvedores de NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "a clase do obxecto «%s» non foi nomeada axeitadamente «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "a propiedade «%s» da clase do obxecto «%s» non é escribíbel"
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -185,20 +195,20 @@ msgstr ""
 "non é posíbel estabelecer despois da construción a propiedade da construción "
 "«%s» do obxecto «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "«%s::%s» non é un nome de propiedade correcto; «%s» non é un subtipo GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:216
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "non é posíbel estabelecer a propiedade «%s» do tipo «%s» desde o valor do "
 "tipo «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:227
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -207,82 +217,81 @@ msgstr ""
 "O valor «%s» do tipo «%s» non é válido ou está fóra do intervalo para a "
 "propiedade «%s» do tipo «%s»"
 
-#. ***************************************************************************
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticación 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.c:209
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Nome da _rede:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "segura."
 
-#: ../src/applet.c:387
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Produciuse un erro ao engadir/activar a conexión"
 
-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Produciuse un fallo na conexión"
 
-#: ../src/applet.c:441
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Produciuse un erro ao desconectar o dispositivo"
 
-#: ../src/applet.c:446
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Produciuse un erro ao desconectar"
 
-#: ../src/applet.c:476
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Produciuse un erro ao activar a conexión"
 
-#: ../src/applet.c:804 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Non mostrar esta mensaxe de novo"
 
-#: ../src/applet.c:894
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +301,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» desconectouse porque a conexión de rede se interrumpiu."
 
-#: ../src/applet.c:896
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -302,7 +311,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque a conexión de rede se interrumpiu."
 
-#: ../src/applet.c:898
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -311,7 +320,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque o servizo VPN parou inesperadamente."
 
-#: ../src/applet.c:900
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +331,7 @@ msgstr ""
 "A conexión VPN «%s» fallou porque o servizo VPN devolveu unha configuración "
 "incorrecta."
 
-#: ../src/applet.c:902
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -331,7 +340,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque excedeu o tempo de espera para conectar."
 
-#: ../src/applet.c:904
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +349,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque o servizo VPN non se iniciou a tempo."
 
-#: ../src/applet.c:906
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +358,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque o servizo VPN non se iniciou correctamente."
 
-#: ../src/applet.c:908
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -358,7 +367,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque non houbo secretos VPN válidos."
 
-#: ../src/applet.c:910
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -367,7 +376,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou porque os secretos VPN non eran válidos."
 
-#: ../src/applet.c:915
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -376,7 +385,7 @@ msgstr ""
 "\n"
 "A conexión VPN «%s» fallou."
 
-#: ../src/applet.c:942
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -387,19 +396,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:944
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "A conexión VPN estabelecida correctamente.\n"
 
-#: ../src/applet.c:946
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mensaxe de inicio de sesión VPN"
 
-#: ../src/applet.c:954 ../src/applet.c:994
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Fallou a conexión VPN"
 
-#: ../src/applet.c:998
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -412,7 +421,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1001
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -425,564 +434,575 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1290
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "o dispositivo non está listo (falta o firmware)"
 
-#: ../src/applet.c:1292
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "o dispositivo non está listo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1302 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1318
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1332
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "o dispositivo non está xestionado"
 
-#: ../src/applet.c:1405
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Non hai dispositivos de rede dispoñíbeis"
 
-#: ../src/applet.c:1459
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Conexións _VPN"
 
-#: ../src/applet.c:1503
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1506
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Engadir unha conexión VPN…"
 
-#: ../src/applet.c:1612
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Non se está executando o NetworkManager…"
 
-#: ../src/applet.c:1617 ../src/applet.c:2682
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Rede desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1827
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activar a _rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1836
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Activar sen _fíos"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1845
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activar a banda larga _móbil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1857
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activar n_otificacións"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1869
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Información da conexión"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1877
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Editar conexións…"
 
-#: ../src/applet.c:1891
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2202
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Agora está conectado a «%s»."
 
-#: ../src/applet.c:2242
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2243
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "A conexión de rede foi desconectada."
 
-#: ../src/applet.c:2545
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparando a conexión de rede «%s»..."
 
-#: ../src/applet.c:2548
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Requírese a autenticación do usuario para a conexión de rede «%s»..."
 
-#: ../src/applet.c:2551 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Solicitando un enderezo de rede para  «%s»..."
 
-#: ../src/applet.c:2554
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexión de rede «%s» activa"
 
-#: ../src/applet.c:2627
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Iniciando a conexión VPN  «%s»..."
 
-#: ../src/applet.c:2630
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Requírese a autenticación do usuario para a conexión VPN «%s»..."
 
-#: ../src/applet.c:2633
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Solicitando un enderezo VPN para «%s»..."
 
-#: ../src/applet.c:2636
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Conexión VPN activa"
 
-#: ../src/applet.c:2686
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Sen conexión de rede"
 
-#: ../src/applet.c:3287
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Código PUK erróneo; contacte co fornecedor do seu servizo."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Código PIN erróneo; contacte co fornecedor do seu servizo."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Enviando o código de desbloqueo..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móbil (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda larga móbil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dispoñíbl"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Nova conexión de banda larga móbil..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Estabeleceuse a conexión"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Agora está conectado á rede de banda larga móbil."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móbil."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Agora está rexistrado na rede de casa."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Agora está rexistrado nunha rede de «roaming»."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Agora está conectado á rede de banda larga móbil."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Preparando a conexión de banda larga móbil  «%s»..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configurando a conexión de banda larga móbil «%s»..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Requírese a autenticación do usuario para a conexión de banda larga móbil "
 "«%s»..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Conexión de banda larga móbil «%s» activa."
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automático"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes con fíos (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede con fíos (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes con fíos"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rede con fíos"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Agora está conectado á rede con fíos."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Preparando a conexión de rede ethernet «%s»..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configurando a conexión de rede ethernet «%s»..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Requírese a autenticación do usuario para a conexión de rede ethernet «%s»..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Solicitando un enderezo de rede ethernet para «%s»..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "A conexión de rede ethernet «%s» está activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:313
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Conectar a unha rede sen fíosF oculta…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Crear unha _nova rede sen fíos..."
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ningunha)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Produciuse un erro ao engadir a nova conexión"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Privilexios insuficientes."
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes sen fíos (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede sen fíos (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede sen fíos"
 msgstr[1] "Redes sen fíos"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "A rede sen fíos está desactivada"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Rede sen fíos desactivada polo interruptor físico"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Máis redes"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Redes sen fíos dispoñíbeis"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Usar o menú de rede para conectarse a unha rede sen fíos"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Agora está conectado á rede sen fíos «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparando a rede sen fíos «%s»..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configurando a conexión de rede sen fíos «%s»..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Requírese a autenticación do usuario para a rede sen fíos «%s»..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Solicitando un enderezo de rede sen fíos para «%s»..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Conexión a rede sen fíos «%s» activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Conexión de rede sen fíos «%s» activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Produciuse un erro ao activar a conexión"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Produciuse un erro ao mostrar a información de conexión:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinámica"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Máis enderezos"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (predeterminada)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Enderezo broadcast"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Máscara de subrede"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primario:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Contrasinal _secundario:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Xeral"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Enderezo de hardware"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguranza:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Camiño predeterminado"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Punto de acceso"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Contrasinal:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipo de VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Pasarela do VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nome de usuario da VPN"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Mensaxe da VPN"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Conexión base"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Descoñecida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Non se atoparon conexións activas válidas!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -992,18 +1012,18 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e moitos outros contribuíntes e tradutores da comunidade"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicativo da área de notificación para xestionar os dispositivos de "
 "rede e as conexións."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Sitio web do NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Marcos Lans, 2017\n"
@@ -1016,7 +1036,7 @@ msgstr ""
 "Proxecto Trasno - Tradución de software libre ao galego <proxecto@trasno."
 "net>, 1999-2012"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1024,33 +1044,33 @@ msgstr ""
 "O miniaplicativo NetworkManager non puido atopar algúns recursos requiridos "
 "(non se atopou o ficheiro .ui)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Faltan recursos"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Contrasinal de rede de banda larga móbil"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Requírese un contrasinal para conectarse a «%s»."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Requírese un código PIN de desbloqueo"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Requírese un código PIN de desbloqueo"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1060,25 +1080,25 @@ msgstr ""
 "poder usalo."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Mostrar o código PIN"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Requírese un código PUK"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Requírese un código PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1088,28 +1108,42 @@ msgstr ""
 "poder usalo."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Código PIN novo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Introducir de novo o código PIN novo:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar os códigos PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Non foi posíbel eliminar a conexión"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Produciuse un erro ao activar a conexión"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1117,56 +1151,56 @@ msgstr ""
 "O enderezo IP identifica o seu computador na rede. Prema no botón «Engadir» "
 "para engadir un enderezo IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norar os camiños obtidos automaticamente"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Usar esta c_onexión só para recursos na súa rede"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Se escolle esta opción, esta conexión nunca se usará como a predeterminada."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "C_rear"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Seleccione un tipo de conexión"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1178,84 +1212,100 @@ msgstr ""
 "Se está creando unha VPN, e o tipo de conexión VPN que quere crear non "
 "aparece na lista, pode que non teña o engadido de VPN correcto instalado."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Dispositivo:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round Robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Activar respaldo"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Balanceo de carga de transmisión adaptativa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Balanceo de carga adaptativo"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomendado)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Conexións unidas (bonded):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_odo:"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Frecuencia de _monitorización:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Nome da _interface:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Monitorización _ligazón:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Obxectivos ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1263,19 +1313,22 @@ msgstr ""
 "Un enderezo IP, ou unha lista separada por comas de enderezos IP, nas que "
 "comprobar o estado da ligazón."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Atraso da li_gazón>"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Atraso da _desligazón:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primario:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1283,107 +1336,161 @@ msgstr ""
 "O nome da interface do dispositivo primario. Se está estabelecido, este "
 "dispositivo sempre será o escravo activo se está dispoñíbel."
 
-#: ../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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Custo da ruta:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioridade:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Modo _horquilla:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "_Conexións mediante bridge:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Atraso da _redirección:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Tempo de _hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Activar a escoita no I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activar _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Idade _máxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Tempo de _envecellamento:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
-msgid "Group _forward mask:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automático"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predeterminado"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "erro non especificado"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Conservar"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Permanente"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Aleatoria"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Estábel"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1393,191 +1500,229 @@ msgstr ""
 "dispositivo de rede co que está activado esta conexión. Esta característica "
 "coñécese como clonado ou «spoofing» da MAC. Exemplo: 00:11:22:33:44:55."
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Enderezo MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Enderezo HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s non válido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "non válido %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "o nome da interface é incorrecta para %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nome da interface incorrecta (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "non é posíbel analizar o nome do dispositivo"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "o enderezo do hardware é incorrecto"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "incorrecto %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "dispositivo"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "incorrecto %s (%s) "
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Produciuse un erro ao actualizar os contrasinais das conexións debido a un "
-"erro descoñecido."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Usar o Data Center Bridging (DCB) para esta conexión"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Control de fluxo"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funcionalidade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Publicidade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Willing"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Opcións…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grupos de prioridade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Estrutura"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioridade do fluxo de control"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Activar ou desactivar a transmisión da pausa de prioridade para cada "
 "Prioridade de usuario."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioridade:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Clase de tráfico:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Ancho de banda estrito:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Prioridade do ancho de banda:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Ancho de bando do grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ID do grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Escriba a prioridade do ID do grupo para cada Prioridade de usuario."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1585,185 +1730,229 @@ msgstr ""
 "Introduza a porcentaxe de banda larga de enlace permitida para cada Grupo de "
 "Prioridade. A suma de todos os grupos debe ser o 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Escriba o porcentaxe de ancho de banda do grupo de prioridade que cada "
 "prioridade de usuario debe usar."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Activar ou desactivar o ancho de banda estrito para cada prioridade de "
 "usuario."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Escriba a clase de tráfico para cada prioridade de usuario."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nome de _usuario:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servizo:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Mos_trar o contrasinal"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Contrasinal:"
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interface"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interface _superior:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interface _superior:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Par cruzado (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Media"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Completa"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Porto:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
-msgstr "_Dispositivo:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "Enderezo MAC _clonado:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "Wake-on-LAN (WOL):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Pre_determinado"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "Ca_pa física"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Difusión"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Paquete má_xico"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "Contrasinal do «Wake-on-LAN»:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Contrasinal para o «Wake-on-LAN» (un Ethernet MAC). Só válido para paquetes "
 "máxicos."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+#, fuzzy
+msgid "Lin_k negotiation"
 msgstr "Negociación de enla_ce:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1774,11 +1963,12 @@ msgstr ""
 "dispositivo. Se non está seguro do que fai, deixe aquí «Ignorar» ou "
 "seleccione «Automática»."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocidade:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1789,11 +1979,12 @@ msgstr ""
 "especificar un valor velocidade, asegúrese de que é compatíbel co "
 "dispositivo."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
-msgid "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+#, fuzzy
+msgid "Duple_x"
 msgstr "Dúple_x:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1803,23 +1994,48 @@ msgstr ""
 "se seleccionaron as opcións «Ignorar» e «Automática». Antes de especificar "
 "un modo dúplex, asegúrese de que é compatíbel co dispositivo."
 
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "Conectarse automaticamente á _VPN ao usar esta conexión"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ningún"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Todos os _usuarios deberían conectarse a esta rede"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Conectarse _automaticamente a esta rede cando estea dispoñíbel"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Conectarse automaticamente á _VPN ao usar esta conexión"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "_Zona da devasa:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Conexións de equipo:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
-msgstr "_Prioridade da conexión para a activación automática:"
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Ig_norar os camiños obtidos automaticamente"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1829,11 +2045,7 @@ msgstr ""
 "números máis altos prefírense ao seleccionar perfís para activación "
 "automática. O valor predeterminado é 0."
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "_Zona da devasa:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1841,7 +2053,7 @@ msgstr ""
 "O enderezo IP identifica o seu computador na rede. Prema no botón «Engadir» "
 "para engadir un enderezo IP estático a configurar xunto aos automáticos."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1852,127 +2064,134 @@ msgstr ""
 "enderezos distribuído a outros computadores. Prema «Engadir» para engadir un "
 "enderezo IP. Se non indica ningún, o rango determinarase automaticamente."
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Enderezos estáticos adicionais"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Enderezos"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Enderezo (opcional)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
 msgstr "Modo de _transporte:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
 msgstr "Nome do dispositivo"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
 msgstr "Dispositivo pai:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
-msgid "Mode:"
-msgstr "Modo:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+msgid "Mode"
+msgstr "Modo"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+#, fuzzy
+msgid "Local IP"
 msgstr "IP local:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+#, fuzzy
+msgid "Remote IP"
 msgstr "IP remoto:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+#, fuzzy
+msgid "Input key"
 msgstr "Clave de entrada:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+#, fuzzy
+msgid "Output key"
 msgstr "Clave de saída:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU:"
-msgstr "MTU:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
+msgid "MTU"
+msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automático con configuración de DNS manual"
 
 # NOTA DO TRADUTOR: parece ser http://en.wikipedia.org/wiki/Link-local_address
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Compartida con outros computadores"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Método:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -1982,8 +2201,8 @@ msgstr ""
 "personalice a configuración da súa computadora. Se desexa usar un "
 "identificador de cliente de DHCP, introdúzao aquí."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1991,25 +2210,26 @@ msgstr ""
 "Os dominios que usar ao resolver os nomes de equipos. Use comas para separar "
 "dominios múltiples."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID do cliente D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Dominios de _busca:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Servidores _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2018,11 +2238,11 @@ msgstr ""
 "equipos. Use comas para separar enderezos de servidores de nomes de dominio "
 "múltiples."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Para completar a conexión requírese un direccionamento IPv_4"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2030,26 +2250,35 @@ msgstr ""
 "Ao conectarse a redes con capacidade de IPv6, permite completar á conexión "
 "se a configuración IPv4 falla pero a configuración IPv6 ten éxito."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Camiños…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Activado (preferir enderezos públicos)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Activado (preferir enderezos temporais)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Estábel"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2060,15 +2289,21 @@ msgstr ""
 "múltiples. Os enderezos de ligazón local restrinxiranse automaticamente á "
 "interface de conexión."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Extensións de _privacidade de IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+#, fuzzy
+msgid "IPv6 address _generation mode"
+msgstr "Enderezo IPv6 «%s» incorrecto"
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Para completar a conexión requírese un direccionamento IPv_6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2076,28 +2311,28 @@ msgstr ""
 "Ao conectar a redes con capacidade de IPv4, permite completar a conexión se "
 "a configuración IPv6 falla pero a IPv4 ten éxito."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Comprobar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Estrito"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Nome do dispositivo MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2105,7 +2340,7 @@ msgstr ""
 "Nome da interface pai ou UUID da conexión pai desde a que crear a interface "
 "MACSEC."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2113,15 +2348,15 @@ msgstr ""
 "Nome da interface pai ou UUID da conexión pai desde a que crear a interface "
 "MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr "Nome da clave para a asociación de conectividades pre-compartida"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Clave da asociación de conectividades pre-compartida"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2131,200 +2366,216 @@ msgstr ""
 "Key Agreement). No modo EAP, encher os parámetros da páxina de seguranza "
 "802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#: src/connection-editor/ce-page-macsec.ui:154
+#, fuzzy
+msgid "CKN"
 msgstr "CKN:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#: src/connection-editor/ce-page-macsec.ui:167
+#, fuzzy
+msgid "CAK"
 msgstr "CAK:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#: src/connection-editor/ce-page-macsec.ui:191
+#, fuzzy
+msgid "Keys"
 msgstr "Claves:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#: src/connection-editor/ce-page-macsec.ui:207
+#, fuzzy
+msgid "Parameters"
 msgstr "Parámetros:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#: src/connection-editor/ce-page-macsec.ui:224
+#, fuzzy
+msgid "Validation"
 msgstr "Validación:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
 msgstr "Porto SCI:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Especifica o modo de validación para as unidades de datos entrantes"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Indica se se debe cifrar o tráfico transmitido"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Compoñente do porto da SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nú_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID de r_ede:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Cambiar..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permitir «_roaming» se a rede doméstica non está dispoñíbel"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Mos_trar os contrasinais"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Métodos permitidos:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurar os _métodos…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Usar o cifrado punto a punto (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Requirir cifrado de 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Usar os _estados MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permitir a compresión de datos _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permitir a compresión de datos _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Usar a compresión de _cabeceiras TCP"
 
 # NOTA DO TRADUTOR: parece ser http://en.wikipedia.org/wiki/Echo_Protocol
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Enviar paquetes _echo PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ningún"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Só para navegador"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Usar esta configuración proxy só para clientes/esquemas do navegador."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+#, fuzzy
+msgid "PAC URL"
 msgstr "URL do PAC:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:64
+#, fuzzy
+msgid "PAC script"
 msgstr "Script da PAC:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL desde onde se obtén o script para a PAC."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importar o script desde un ficheiro..."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
 msgstr "Método:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "A_vanzado..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Estabelecido polo mestre"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Estado do porto ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Opcións avanzadas de equipo"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+#, fuzzy
+msgid "_Queue ID"
 msgstr "ID da _cola:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2332,20 +2583,21 @@ msgstr ""
 "Número de refachos de NA non solicitadas e paquetes ARP innecesarios "
 "enviados despois de activar ou desactivar o porto."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID da cola que se debería asignar a este porto."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Opcións do executor de copias de seguranza activo"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "_Port priority:"
+#: src/connection-editor/ce-page-team-port.ui:271
+#, fuzzy
+msgid "_Port priority"
 msgstr "_Prioridade do porto:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2353,37 +2605,34 @@ msgstr ""
 "O valor é un número positivo en milisegundos. Especifica un intervalo entre "
 "refachos de paquetes de notificación-par."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Prioridade do porto. O número máis alto significa maior prioridade."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Porto _fixo"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
-"Validar os paquetes ARP recibidos en portos activos. Se non está marcado, "
-"todos os paquetes ARP entrantes consideraranse bos."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Opcións do executor LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
 msgstr "Prioridade do porto _LACP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+msgid "LACP port _key"
 msgstr "Clave do _porto LACP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2391,7 +2640,7 @@ msgstr ""
 "Número de refachos de peticións para unirse de novo a un grupo multidifusión "
 "enviados despois de que o porto se active ou desactive."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2399,8 +2648,8 @@ msgstr ""
 "Prioridade do porto segundo o estándar LACP. O número máis baixo significa "
 "maior prioridade."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2408,7 +2657,7 @@ msgstr ""
 "O valor é un número positivo en milisegundos. Especifica un intervalo entre "
 "refachos de peticións para unirse de novo a un grupo multidifusión."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2416,48 +2665,56 @@ msgstr ""
 "Clave do porto segundo o estándar LACP. Só é posíbel engadir portos coa "
 "mesma clave."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+#, fuzzy
+msgid "_Link watcher"
 msgstr "Observador de _ligazóns:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+#, fuzzy
+msgid "_Up delay"
 msgstr "A_umentar retraso:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+#, fuzzy
+msgid "_Down delay"
 msgstr "_Disminuír retraso:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+#, fuzzy
+msgid "Send _interval"
 msgstr "_Intervalo de envío:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+#, fuzzy
+msgid "Delay _before first send"
 msgstr "Retraso _antes do primeiro envío:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+#, fuzzy
+msgid "_Maximum missed replies"
 msgstr "Número _máximo de respostas perdidas:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
 msgstr "_Servidor de orixe:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+#, fuzzy
+msgid "_Target host"
 msgstr "Servidor de des_tino:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2465,8 +2722,8 @@ msgstr ""
 "Número máximo de respostas perdidas. Se se excede este número, a ligazón "
 "infórmase como caída."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2474,8 +2731,8 @@ msgstr ""
 "Nome do servidor a converter a un enderezo IP para poñer como enderezo de "
 "orixe nas peticións ARP."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2483,18 +2740,27 @@ msgstr ""
 "Nome do servidor a converter a un enderezo IP para poñer como enderezo de "
 "destino nas peticións ARP."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignorar os paquetes incorrectos dos portos _activos"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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 ""
+"Validar os paquetes ARP recibidos en portos activos. Se non está marcado, "
+"todos os paquetes ARP entrantes consideraranse bos."
+
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignorar os paquetes incorrectos dos portos i_nactivos"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2502,13 +2768,13 @@ msgstr ""
 "Validar os paquetes ARP recibidos en portos inactivos. Se non está marcado, "
 "todos os paquetes ARP entrantes consideraranse bos."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "_Enviar por portos inactivos"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2516,159 +2782,165 @@ msgstr ""
 "Predeterminadamente, as peticións ARP envíanse unicamente por portos "
 "activos. Esta opción permite tamén os envíos por portos inactivos."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr "Retraso entre a ligazón que xorde e a notificación ao executor."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "Retraso entre a ligazón que cae e a notificación ao executor."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Intervalo entre envíos de peticións."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Retraso entre o inicio do observador de ligazóns e a primeira petición "
 "enviada."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Observador de ligazóns a usar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Observador de ligazóns"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_portar a configuración do equipo desde un ficheiro..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
 msgstr "Editar a configuración _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Configuración sen elaborar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Prioridade máxima"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Prioridade máxima (estábel)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Largo de banda"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Número máximo de portos"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Prioridade do porto"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Desde o dispositivo do equipo"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Desde o porto activo"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Desde o activo ao dispositivo do equipo"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Conexións de equipo:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Equilibrio da carga"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cableada"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Calquera protocolo L3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Calquera protocolo L4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+#, fuzzy
+msgid "_Peer notification count"
 msgstr "Número de notificación ao _par:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+#, fuzzy
+msgid "Peer _notification interval"
 msgstr "Intervalo entre notificacións ao _par:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+#, fuzzy
+msgid "_Multicast rejoin count"
 msgstr "Nú_mero de conexións á multidifusión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+#, fuzzy
+msgid "Multicast _rejoin interval"
 msgstr "Intervalo entre _conexións á multidifusión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "Enderezo do _hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2676,19 +2948,21 @@ msgstr ""
 "Enderezo do hardware desexado do novo dispositivo de equipo. Acéptase o "
 "formato MAC habitual."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+#: src/connection-editor/ce-page-team.ui:798
+#, fuzzy
+msgid "_Runner"
 msgstr "_Executor:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
 msgstr "Directiva sobre enderezo do _hardware:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Nome do executor a usar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2697,11 +2971,11 @@ msgstr ""
 "do dispositivo do equipo e dos dispositivos dos portos durante a vida do "
 "equipo."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Enviar unidades de datos LACPDU _periodicamente"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2709,11 +2983,11 @@ msgstr ""
 "Se está marcada, as unidades de datos LACPDU envíanse periodicamente polas "
 "ligazóns configuradas. Noutro caso, actúa como «fala cando che falan»."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Enviar unha unidade LACPDU _cada segundo"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2723,23 +2997,26 @@ msgstr ""
 "transmita os paquetes LACPDU. Se está marcada, os paquetes enviaranse unha "
 "vez por segundo. Noutro caso enviaranse cada 30 segundos."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
-msgid "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+#, fuzzy
+msgid "_System priority"
 msgstr "Prioridade do _sistema:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+#, fuzzy
+msgid "_Minimum ports"
 msgstr "Portos _mínimos:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+#, fuzzy
+msgid "_Aggregator selection policy"
 msgstr "Directiva de selección do _agregador:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Prioridade do sistema, o valor pode estar entre 0 – 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2747,11 +3024,11 @@ msgstr ""
 "Especifica o número mínimo de portos que deben estar abertos antes de "
 "aceptar a operadora na interface mestra. O valor pode estar entre 1 e 255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Isto selecciona a directiva de como se seleccionarán os agregadores."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2759,184 +3036,194 @@ msgstr ""
 "Lista de tipos de anacos (cadeas) a usar para a computación de «hash» de "
 "transacción de paquetes"
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Campos para o hash de transmisión"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "Intervalo periódico en décimas de segundo entre reequilibiros."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Nome do equilibrador Tx activo. O equilibrador Tx activo está desactivado "
 "predeterminadamente."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
-msgid "Transmission _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
 msgstr "Intervalo entre equilibrados _da transmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
 msgstr "Equilibrador da _transmisión:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Executor"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Interface _superior:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "Nome da inter_face VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "Endere_zo MAC clonado:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_ID VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Marcas:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Reordenar cabeceiras"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Ligazóns flexíbeis"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Nome do dispositivo + número"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + número"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "S_eguranza:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Cliente"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Punto de acceso"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Po_tencia da transmisión:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Velocidade:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "C_anle:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Non hai autorización do polkit para executar esta acción"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Métodos de autenticación permitidos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensíbel Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -2945,121 +3232,98 @@ msgstr ""
 "métodos de autenticación. Se fallan as conexións, tente desactivar a "
 "compatibilidade dalgúns métodos."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sen fíos"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equipo"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:221
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "Túnel IP"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"O engadido VPN fallou ao importar a conexión VPN correctamente\n"
-"\n"
-"Erro: non existe o tipo de servizo VPN."
-
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Non é posíbel importar a conexión VPN"
 
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Non foi posíbel ler o ficheiro «%s» ou non contén información de conexión "
-"VPN recoñecíbel\n"
+"O engadido VPN fallou ao importar a conexión VPN correctamente\n"
 "\n"
-"Erro: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "erro descoñecido"
+"Erro: non existe o tipo de servizo VPN."
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Seleccione o ficheiro para importar"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importar unha configuración VPN gardada..."
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3067,76 +3331,83 @@ msgstr ""
 "Non foi posíbel inicializar o diálogo do editor de conexións por mor dun "
 "erro descoñecido."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Non foi posíbel crear a nova conexión"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Fallou a eliminación da conexión"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Está seguro de que quere eliminar a conexión %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Conexións _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Máscara de rede"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Pasarela"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Métrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Editando unha conexión sen nome"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Nome da conexión que falta"
 
-#: ../src/connection-editor/nm-connection-editor.c:353
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Iniciando o editor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Non é posíbel modificar a conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:375
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Axuste incorrecto %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:451
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3144,33 +3415,33 @@ msgstr ""
 "O editor de conexión non puido atopar algúns recursos requiridos (non se "
 "encontrou o ficheiro .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:578
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Gardar calquera cambio feito nesta conexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:580
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autenticarse para gardar esta conexión para todos os usuarios desta máquina."
 
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Non foi posíbel crear a conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Non foi posíbel editar a conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:598
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Produciuse un erro ao crear o diálogo do editor de conexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:739
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3178,19 +3449,19 @@ msgstr ""
 "Aviso: a conexión contén algunhas propiedades nos aceptadas polo editor. "
 "Eliminaranse ao gardar."
 
-#: ../src/connection-editor/nm-connection-editor.c:759
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Produciuse un erro ao inicializar o editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1159
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Fallou a inserción da conexión"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Arranxar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3198,23 +3469,24 @@ msgstr ""
 "As etiquetas de seguranza poden impedir que algúns ficheiros se usen con "
 "autenticación por certificado."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nome da conexión:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Exportar…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Reetiquetado do ficheiro"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Reetiquetado"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3222,187 +3494,212 @@ msgstr ""
 "Os seguintes ficheiros non están etiquetados para usar con autenticación por "
 "certificado. Desexa axustar as etiquetas?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Reetiquetar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hai %d minuto"
 msgstr[1] "hai %d minutos"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hai %d hora"
 msgstr[1] "hai %d horas"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hai %d día"
 msgstr[1] "hai %d días"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hai %d mes"
 msgstr[1] "hai %d meses"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai %d ano"
 msgstr[1] "hai %d anos"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Non foi posíbel eliminar a conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:448
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Seleccionar a conexión a editar"
 
-#: ../src/connection-editor/nm-connection-list.c:450
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Seleccionar a conexión a eliminar"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Último uso"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Editar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentíquese para editar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Eliminar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentíquese para eliminar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Tipo de conexión de banda larga móbil non permitido."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Non sabe como crear conexións «%s»"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Produciuse un erro ao editar a conexión"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Produciuse un erro ao crear a conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Non é posíbel modificar a conexión"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Non hai ningún engadido de VPN instalado."
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Non sabe como crear conexións «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Produciuse un erro ao editar a conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Non atopou unha conexión co UUID «%s»"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Conexións de rede"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Engadir unha nova conexión"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguridade 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de seguranza 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar a seguridade 802.1_X para esta conexión"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Enderezo MAC do dispositivo Bluetooth. Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Non foi posíbel cargar a interface do usuario de Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "Dispositivo Bluetooth incorrecto (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexión de Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Tipo de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Seleccionar o tipo do perfil da conexión Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Rede de área _persoal"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Re_de por liña telefónica"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de bond."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primaria"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Conexión Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:224
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de bridge."
 
-#: ../src/connection-editor/page-bridge.c:328
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexión bridge %d"
@@ -3410,32 +3707,37 @@ msgstr "Conexión bridge %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Porto bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Non foi posíbel cargar a interface de usuario do porto bridge."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interface _superior:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexión DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3445,41 +3747,40 @@ msgstr ""
 "polo seu nome de interface, MAC permanente ou ambos os dous. Por exemplo: "
 "«em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ignorado"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Non foi posíbel cargar a interface de usuario cableada."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Dispositivo Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Contrasinal do «Wake-on-LAN»"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexión con fíos %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3489,11 +3790,11 @@ msgstr ""
 "normal, seleccionándoa resulta no uso da zona por omisión estabelecida na "
 "devasa. Só usábel se firewalld está activo."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Non foi posíbel cargar a interface de usuario Xeral."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3505,166 +3806,160 @@ msgstr ""
 "«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)»"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Non foi posíbel cargar a interface de usuario InfiniBand"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "Dispositivo infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexión InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Non foi posíbel cargar a interface do usuario por túnel IP."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Conexión por túnel IP %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Só enderezos automáticos (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automático, só enderezos"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Só enderezos automáticos (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Só enderezos automáticos (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Só ligazón local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Servidores _DNS adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dominios de _busca adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando os camiños IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Configuración IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Non foi posíbel cargar a inferface de usuario IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "O enderezo IPv4 «%s» é incorrecto"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "A máscara de rede do enderezo IPv4 «%s» non é válida"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "A pasarela IPv4 «%s» non é válida"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "O servidor DNS IPv4 «%s» non é válido"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automático , só DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando os camiños IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Configuración IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Non foi posíbel cargar a interface de usuario IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "O enderezo IPv6 «%s» non é válido"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "O prefixo IPv6 «%s» non é válido"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "A pasarela IPv6 «%s» non é válida"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "O servidor DNS IPv6 «%s» non é válido"
 
-#: ../src/connection-editor/page-macsec.c:192
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Non foi posíbel cargar a interface de usuario MACsec."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "Conexión MACSEC %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Duplicar escravos"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Os escravos «%s» e «%s» aplícanse ao dispositivo «%s»"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3673,25 +3968,25 @@ msgstr ""
 "Os escravos «%s» e «%s» aplícanse a diferentes portos virtuais («%s» e «%s») "
 "do mesmo dispositivo físico."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclavo %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de banda larga móbil."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tipo de conexión de banda larga móbil non permitido."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccione o tipo de provedor de banda larga móbil"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3699,7 +3994,7 @@ msgstr ""
 "Seleccione a tecnoloxía que usa a súa operadora de banda larga móbil. Se non "
 "está certo, pregunte á operadora."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "O meu provedor emprega unha tecnoloxía baseada en _GSM (p.ex. GPRS, EDGE, "
@@ -3707,79 +4002,79 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "O meu provedor emprega unha tecnoloxía baseada en C_DMA (p.ex. RTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ningunha"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editando os métodos de autenticación PPP para %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Configuración de PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Non foi posíbel cargar a interface de usuario PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Non foi posíbel cargar a interface do usuario por proxy."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Erro: o ficheiro non contén unha configuración JSON válida"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Non foi posíbel cargar a inferface de usuario de equipo."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexión de equipo %d"
@@ -3787,68 +4082,67 @@ msgstr "Conexión de equipo %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Porto de equipo"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Non foi posíbel cargar a interface de usuario do porto de equipo."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (vía «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Nova conexión..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Non foi posíbel cargar a inferface de usuario de vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan principal"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Conexión VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Non foi posíbel cargar a interface de usuario VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Non foi posíbel atopar o engadido do VPN para «%s»."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Non foi posíbel cargar o engadido do VPN para «%s» (%s)."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "fallo descoñecido"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Non foi posíbel cargar a interface de usuario VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Non foi posíbel atopar o engadido do VPN para «%s»."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexión VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccione un tipo de conexión VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3858,7 +4152,7 @@ msgstr ""
 "conexión VPN que desexa crear non aparece na lista, pode que non teña "
 "instalado o engadido VPN correcto."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -3866,7 +4160,7 @@ msgstr ""
 "Esta opción bloquea a conexión ao punto de acceso sen fíos (AP) especificado "
 "polo BSSID introducido aquí. Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -3876,95 +4170,93 @@ msgstr ""
 "polo seu nome de interface, MAC permanente ou ambos os dous. Por exemplo: "
 "«wlan0», «3C:97:0E:42:1A:19», «wlan0 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Non foi posíbel cargar a interface de usuario sen fíos."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Dispositivo wifi"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexión sen fíos %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clave WEP de 40/128 bits (Hexadecimal ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase de paso WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinámica (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoal"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Empresarial"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Non foi posíbel cargar a interface de usuario de seguridade sen fíos, faltan "
 "os axustes en fíos."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Seguranza sen fíos"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Non foi posíbel cargar a interface de usuario de seguridade sen fíos."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "Falta o SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "A seguranza non é compatíbel co modo Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Xa existe un ficheiro chamado «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "Substituí_r"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Quere substituír %s coa conexión VPN que está gardando?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Non é posíbel exportar a conexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3975,220 +4267,103 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Exportar conexión VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Desbloq_uear"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Bloquear automaticamente este dispositivo"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Información de conexión"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "Pe_char"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Conexións de rede activas"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Non hai un certificado estabelecido"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Non hai unha clave estabelecida"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Seleccionar unha clave para o certificado %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "_Clave privada de %s:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "Contrasinal da _clave %s:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Seleccionar o certificado %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "_Certificado de %s:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"A súa conexión de banda larga móbil está configurada coas seguintes "
-"preferencias:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "O seu dispositivo:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "O seu provedor:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "O seu plan:"
-
-#: ../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."
-msgstr ""
-"Estabelecerase unha conexión coa operadora da banda larga móbil usando os "
-"axustes que seleccionou. Se falla a conexión ou non pode acceder aos "
-"recursos de rede, volva comprobar os axustes. Para modificar a configuración "
-"da conexión da banda larga móbil, seleccione «Conexións de rede» no menú "
-"Sistema → Preferencias."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirme as preferencias da conexión de banda larga móbil"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "O meu país non está na lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Sen listar"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Seleccione o seu plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Seleccione o seu plan _APN (Access Point Name):"
-
-#: ../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."
-msgstr ""
-"Aviso: seleccionar un plan incorrecto pode resultar en incidencias de "
-"facturación na conta da banda larga ou pode impedir a conectividade.\n"
-"\n"
-"Se non está seguro do seu plan, pregúntelle á súa operadora polo plan APN."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Seleccione o seu plan de facturación"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "O meu plan non está listado..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Seleccione un provedor desde a _lista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provedor"
 
-#: ../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:"
-msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Provedor:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "O meu provedor emprega a tecnoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "O meu provedor emprega a tecnoloxía CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Seleccione o seu provedor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista de paises ou estados:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País ou estado"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "O meu país non está na lista"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
-msgstr "Seleccione o país ou rexión da súa operadora"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Calquera dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova conexión de banda larga móbil"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4196,181 +4371,256 @@ msgstr ""
 "Este asistente axúdao a configurar a súa conexión de banda larga móbil a "
 "unha rede celular (3G) de forma sinxela."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vostede precisará a seguinte información:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Nome da operadora de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "O nome do plan de facturación de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(nalgúns casos) O seu APN do plan de facturación de banda larga (Access "
 "Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crear unha conexión para es_te dispositivo de banda larga móbil:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Calquera dispositivo"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar unha conexión de banda larga móbil"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova conexión de banda larga móbil"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País ou estado"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
+msgstr "Seleccione o país ou rexión da súa operadora"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Seleccione un provedor desde a _lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O meu provedor emprega a tecnoloxía GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O meu provedor emprega a tecnoloxía CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Seleccione o seu provedor"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Seleccione o seu plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Seleccione o seu plan _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+"Aviso: seleccionar un plan incorrecto pode resultar en incidencias de "
+"facturación na conta da banda larga ou pode impedir a conectividade.\n"
+"\n"
+"Se non está seguro do seu plan, pregúntelle á súa operadora polo plan APN."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Seleccione o seu plan de facturación"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"A súa conexión de banda larga móbil está configurada coas seguintes "
+"preferencias:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "O seu dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "O seu provedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "O seu plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
+"Estabelecerase unha conexión coa operadora da banda larga móbil usando os "
+"axustes que seleccionou. Se falla a conexión ou non pode acceder aos "
+"recursos de rede, volva comprobar os axustes. Para modificar a configuración "
+"da conexión da banda larga móbil, seleccione «Conexións de rede» no menú "
+"Sistema → Preferencias."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirme as preferencias da conexión de banda larga móbil"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Ningún)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Clave en %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certificado en %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Descoñecido)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Seleccionar dun ficheiro..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Seleccione un Certificado %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
-#, c-format
-msgid "%s certificate _password:"
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
 msgstr "_Contrasinal do certificado %s:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Produciuse un erro iniciando sesión en: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Produciuse un erro abrindo a sesión: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "«Token» de des_bloqueo"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Emitido por"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Introducir o PIN de %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Iniciar a sesión"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Lembrar o PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Gardar só o contrasinal deste usuario"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Gardar o contrasinal de todos os usuarios"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Pedir o contrasinal sempre"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Non se precisa contrasinal"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "Contrasinal _secundario:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "M_ostrar os contrasinais"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Contrasinal _terciaria:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "M_ostrar os contrasinais"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Contrasinal _secundario:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Prema para conectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Falta o contrasinal ou a conexión é incorrecta. No último caso, debe editar "
-"primeiro a conexión con nm-connection-editor"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Novo…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ningún"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinámica (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4378,35 +4628,35 @@ msgstr ""
 "Requírese o contrasinal ou clave de cifrado para acceder á rede sen fíos "
 "«%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Requírese a autenticación para a rede sen fíos"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "A rede sen fíos require autenticación"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Crear unha rede sen fíos"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Rede sen fíos nova"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Escriba un nome para a rede sen fíos que quere crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectarse a unha rede sen fíos oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Rede sen fíos oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4414,35 +4664,54 @@ msgstr ""
 "Escriba o nome e os detalles de seguranza da rede sen fíos á que quere "
 "conectarse."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Seguranza sen fíos:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nexión:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Adaptador sen fíos:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Non atopo a miña operadora e quero introducila _manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Provedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista de paises ou estados:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País ou estado"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Con fíos"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4452,17 +4721,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Falta o contrasinal ou a conexión é incorrecta. No último caso, debe editar "
+"primeiro a conexión con nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Seguranza sen fíos:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Nome da _rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexión:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptador sen fíos:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4470,7 +4763,7 @@ msgstr ""
 "Este programa é un compoñente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4478,320 +4771,343 @@ msgstr ""
 "Non está pensado para a interacción a través da liña de ordes pero no seu "
 "lugar execútase no ambiente de escritorio GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "desactivado"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "non rexistrado"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "denegouse o rexistro"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Código da PIN para a tarxeta SIM «%s» en «%s»"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Requírese un código PIN"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "É necesario un código PIN para o dispositivo de banda larga móbil"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "A conexión de banda larga móbil «%s» está activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Conexión %s"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificados PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "produciuse un erro sen definir na seguranza 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "non seleccionou ningún certificado CA"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "o certificado CA seleccionado non existe"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "Falta o ficheiro EAP-FAST PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Seleccione un ficheiro PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: ../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:3
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identidade anóni_ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Ficheiro _PAC:"
 
-#: ../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:1
-msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Autenticación i_nterna:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automática"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "Falta o nome do usuario do EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "Falta o contrasinal do EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Non se p_recisa un certificado CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Versión _PEAP:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Sufixo do nome do certificado do servidor."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
-msgid "_Domain:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+#, fuzzy
+msgid "_Domain"
 msgstr "_Dominio:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "Falta o nome do usuario EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "Falta o contrasinal EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Contrasinal de chave _privada:"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "M_ostrar os contrasinais"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "Falta a identidade EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "ningún certificado de usuario seleccionado"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "o certificado de usuario seleccionado non existe"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "non seleccionou ningunha clave"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "a clave seleccionada non existe"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "I_dentidade:"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (non EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Produciuse un erro descoñecido validando a seguranza 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS por medio de túnel"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protexido (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "Falta o nome do usuario do leap"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "Falta o contrasinal do leap"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "Falta a clave wep"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "Clave wep incorrecta: as claves cunha lonxitude de %zu deben conter só "
 "díxitos hexadecimais"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4799,7 +5115,7 @@ msgstr ""
 "Clave wep incorrecta: as claves cunha lonxitude de %zu deben conter só "
 "caracteres ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4808,39 +5124,41 @@ msgstr ""
 "Clave wep incorrecta: a lonxitude da clave %zu é incorrecta. Unha clave debe "
 "ter unha lonxitude de 5/13 (ascii) ou 10/26 (hexadecimal)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "Clave wep incorrecta: a frase de paso non pode quedar baleira"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "Clave wep incorrecta: a frase de paso debe ser menor de 64 caracteres"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predeterminada)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Clave:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Mo_strar a clave"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Índic_e WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4849,18 +5167,89 @@ msgstr ""
 "wpa-psk incorrecta: a lonxitude da clave %zu é incorrecta. Debe ser [8,63] "
 "bytes ou 64 díxitos hexadecimais"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk incorrecta: non é posíbel interpretar unha clave con 64 bytes como "
 "hexadecimal"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipo:"
 
-#~ msgid "0"
-#~ msgstr "0"
+#~ msgid "%s (default)"
+#~ msgstr "%s (predeterminada)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorado"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Produciuse un erro ao actualizar os contrasinais das conexións debido a "
+#~ "un erro descoñecido."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioridade:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Conectarse _automaticamente a esta rede cando estea dispoñíbel"
+
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Prioridade da conexión para a activación automática:"
+
+#~ msgid "Mode:"
+#~ msgstr "Modo:"
+
+#~ msgid "MTU:"
+#~ msgstr "MTU:"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Non é posíbel importar a conexión VPN"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Non foi posíbel ler o ficheiro «%s» ou non contén información de conexión "
+#~ "VPN recoñecíbel\n"
+#~ "\n"
+#~ "Erro: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "erro descoñecido"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Conexións de rede activas"
 
 #~ msgid "Disconnected - you are now offline"
 #~ msgstr "Está sen conexión á rede"
@@ -4877,12 +5266,6 @@ msgstr "_Tipo:"
 #~ msgid "Modem network"
 #~ msgstr "Rede de módem"
 
-#~ msgid "Mode"
-#~ msgstr "Modo"
-
-#~ msgid "MTU"
-#~ msgstr "MTU"
-
 #~ msgid "Full duple_x"
 #~ msgstr "Full dúple_x"
 
@@ -4991,9 +5374,6 @@ msgstr "_Tipo:"
 #~ msgid "Private _key:"
 #~ msgstr "_Chave privada:"
 
-#~ msgid "_Private key password:"
-#~ msgstr "Contrasinal de chave _privada:"
-
 #~ msgid "_User certificate:"
 #~ msgstr "Certificado de _usuario:"
 
@@ -5080,15 +5460,6 @@ msgstr "_Tipo:"
 #~ "\n"
 #~ "(Pode protexer a súa chave privada con un contrasinal con openssl)"
 
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
 #~ msgid "Preparing mobile broadband connection '%s'..."
 #~ msgstr "Preparando a conexión de banda larga móbil '%s'…"
 
@@ -5317,18 +5688,6 @@ msgstr "_Tipo:"
 #~ msgid "Options..."
 #~ msgstr "Opcións…"
 
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
 #~ msgid "15"
 #~ msgstr "15"
 
@@ -5408,9 +5767,6 @@ msgstr "_Tipo:"
 #~ msgid "IPv6 prefix \"%s\" invalid"
 #~ msgstr "Falta o prefixo «%s» do IPv6"
 
-#~ msgid "IPv6 address \"%s\" invalid"
-#~ msgstr "Enderezo IPv6 «%s» incorrecto"
-
 #~ msgid "IPv4 DNS server \"%s\" invalid"
 #~ msgstr "Servidor DNS  IPv4 «%s» incorrecto"
 
diff --git a/po/gu.po b/po/gu.po
index a6f21238..de5f253f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-09-01 21:44+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -20,39 +21,48 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "નેટવર્ક"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "તમારા નેટવર્ક જોડાણોને સંચાલિત કરો"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "નેટવર્ક જોડાણો"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "નેટવર્ક જોડાણો સક્રિય કરો"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "તમારા નેટવર્ક જોડાણ સુયોજનોને બદલો અને સંચાલિત કરો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "જોડાયેલ સૂચનાઓને નિષ્ક્રિય કરો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
 "કરો."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "જોડાયેલ નહિં હોય તેવી સૂચનાઓને નિષ્ક્રિય કરો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -60,11 +70,11 @@ msgstr ""
 "જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
 "તરીકે સુયોજિત કરો."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN સૂચનાઓને નિષ્ક્રિય કરો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -73,30 +83,31 @@ msgstr ""
 "જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
 "તરીકે સુયોજિત કરો."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "નેટવર્ક ઉપલબ્ધ સૂચનાઓને દાબી દો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "જ્યારે નેટવર્કો ઉપલ્બધ હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત કરો."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "સ્ટૅમ્પ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "નક્કી કરવા માટે વાપરેલ છે ક્યાંતો સુયોજનો અ નવી આવૃત્તિમાં સ્થળાંતર થયેલ હોવા જોઇએ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi બનાવવાનું નિષ્ક્રિય કરો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -104,154 +115,167 @@ msgstr ""
 "જ્યારે એપલેટ ને વાપરી રહ્યા હોય ત્યારે adhoc નેટવર્કોને બનાવવાનું નિષ્ક્રિય કરવા માટે આને "
 "TRUE તરીકે સુયોજિત કરો."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "સૂચન વિસ્તારમાં ઍપલેટને બતાવો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA પ્રમાણપત્રને અવગણો"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "નેટવર્ક વ્યવસ્થાપક"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "નેટવર્ક જોડાણ નથી"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager એપ્લેટ"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "જોડાવો (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "નેટવર્ક નામ (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "જોડાણને ઉમેરવાનું/સક્રિય કરવામાં નિષ્ફળ"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "જોડાણ નિષ્ફળ"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ઉપકરણનું જોડાણ તોડવામાં નિષ્ફળતા"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "નિષ્ફળતા જોડાયેલ નથી"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "જોડાણ સક્રિયકરણ નિષ્ફળ"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ફરીથા આ સંદેશને બતાવો નહિં"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -261,7 +285,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' જોડાયેલ નથી કારણ કે નેટવર્ક જોડાણ અટકેલ હતુ."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -271,7 +295,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે નેટવર્ક જોડાણ એ અટકેલ હતા."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,7 +304,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા અનિચ્છનીય રીતે અટકેલ છે."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા એ અયોગ્ય રૂપરેખાંકન પાછુ લાવેલ છે."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે જોડાણ પ્રયત્ન કરવાનો સમય સમાપ્ત થયેલ છે."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા સમય પર શરૂ થઇ ન હતી."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા શરૂ કરતી વખતે નિષ્ફળ."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN ગુપ્તતાઓ યોગ્ય ન હતી."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ અયોગ્ય ગુપ્તતાઓને કારણે."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN પ્રવેશ સંદેશ"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN જોડાણ નિષ્ફળ"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -377,7 +401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,566 +414,591 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ઉપકરણ તૈયાર નથી (ગેરહાજર ફર્મવેર)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ઉપકરણ તૈયાર નથી"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "જોડાયેલ નથી"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "જોડાણ તોડી નાંખો"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ઉપકરણ સંચાલિત નથી"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "નેટવર્ક ઉપકરણો ઉપલ્બધ નથી"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN જોડાણો (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN ને રૂપરેખાંકિત કરો (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN જોડાણો (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "નેટવર્ક વ્યવસ્થાપક ચાલતું નથી..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "નેટવર્કીંગ નિષ્ક્રિય થયેલ છે"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "નેટવર્કીંગને સક્રિય કરો (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi ને સક્રિય કરો ( _W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ ને સક્રિય કરો (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "સૂચનાઓને સક્રિય કરો (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "જોડાણ જાણકારી (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "જોડાણોમાં ફેરફાર કરો..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "તમે હવે '%s' માં જોડાયેલ છો."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "જોડાયેલ નથી"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "નેટવર્ક જોડાણ ને બિનજોડાણ કરી દેવામાં આવ્યુ છે."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "નેટવર્ક જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' માટે નેટવર્ક સરનામાંની માંગણી કરી રહ્યા છે..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "નેટવર્ક જોડાણ '%s' સક્રિય છે"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN જોડાણ '%s' ને શરૂ કરી રહ્યા છે..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' માટે VPN સરનામાંનું સૂચન કરી રહ્યા છે..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN જોડાણ '%s' સક્રિય છે"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "નેટવર્ક જોડાણ નથી"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager એપ્લેટ"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ખોટો PUK કોડ; મહેરબાની કરીને તમારા પોષણકર્તાનો સંપર્ક કરો."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ખોટો PIN કોડ; મહેરબાની કરીને તમારા પોષણકર્તાનો સંપર્ક કરો."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "તાળુ ખૂલેલ કોડને મોકલી રહ્યા છે..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "મોબાઇલ બ્રોડબેન્ડ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ઉપલબ્ધ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "જોડાણ સ્થાપિત થયેલ છે"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "તમે હવે મોબાઇલ બ્રોડબૅન્ડ  નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "મોબાઇલ બ્રોડબેન્ડ નેટવર્ક પાસવર્ડ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "તમે હવે ઘર નેટવર્ક પર રજીસ્ટર થયેલ છે."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "તમે હવે રોમિંગ નેટવર્ક પર રજીસ્ટર થયેલ છે."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "તમે હવે મોબાઇલ બ્રોડબૅન્ડ  નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' સક્રિય"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "સ્વયં ઇથરનેટ"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "વાયરલેસ નેટવર્કો (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "વાયરવાળા નેટવર્ક (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "વાયરવાળા નેટવર્કો"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "વાયરવાળુ નેટવર્ક"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "તમે હવે વાયરવાળુ નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' માટે વાયરવાળુ નેટવર્ક સરનામું સૂચન કરી રહ્યુ છે..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ઇથરનેટ નેટવર્ક જોડાણ '%s' સક્રિય"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL સત્તાધિકરણ"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(કંઇ નહિં)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "નવા જોડાણને ઉમેરવામાં નિષ્ફળતા"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi નેટવર્ક (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi નેટવર્ક (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi નેટવર્ક"
 msgstr[1] "Wi-Fi નેટવર્કો"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi નિષ્ક્રિય થયેલ છે"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "હાર્ડવેર સ્વિચ દ્દારા Wi-Fi નિષ્ક્રિય થયેલ છે"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "વધારે નેટવર્કો"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi નેટવર્ક ઉપલબ્ધ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi નેટવર્ક સાથે જોડાવા માટે નેટવર્ક મેનુને વાપરો"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "તમે હવે Wi-Fi નેટવર્ક '%s' સાથે જોડાયેલ છે."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi નેટવર્ક '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' માટે Wi-Fi નેટવર્ક સરનામાંને સૂચિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' સક્રિય: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' સક્રિય"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "જોડાણને સક્રિય કરવામાં નિષ્ફળતા"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "જોડાણ જાણકારીને દેખાડવામાં ભૂલ:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ડાયનેમિક WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "સરનામું"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (મૂળભૂત)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP સરનામું"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "બ્રોડકાસ્ટ સરનામું"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "સબનેટ માસ્ક"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "પ્રાથમિક (_P):"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ગૌણ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ટર્નરિ DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ઇથરનેટ (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ઇન્ટરફેસ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "હાર્ડવેર સરનામું"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ડ્રાઇવર"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ઝડપ"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "સુરક્ષા:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "મૂળભૂત માર્ગ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "અવગણેલ"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "પાસવર્ડ:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN પ્રકાર"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN ગેટવે"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN વપરાશકર્તાનામ"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN બૅનર"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "આધાર જોડાણ"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "યોગ્ય સક્રિય જોડાણ શોધાયુ નથી!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -957,48 +1006,52 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "અને ઘણા બીજા સમુદાયનાં ફાળકો અને અનુવાદકો"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "તમારા નેટવર્ક ઉપકરણો અને જોડાણો ને સંચાલિત કરવા માટે સૂચના વિસ્તાર એપલેટ."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "નેટવર્ક વ્યવસ્થાપક વેબસાઇટ"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "NetworkManager એપ્લેટ અમુક જરૂરી સ્રોતો શોધી શકી નહિં (.ui ફાઇલ મળ્યુ નથી)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ગુમ થયેલ સ્ત્રોતો"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "મોબાઇલ બ્રોડબેન્ડ નેટવર્ક પાસવર્ડ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "પાસવર્ડ ને '%s' માં જોડાવાની જરૂરિયાત છે."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "પાસવર્ડ:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN તાળુ ખોલવુ જરૂરી"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN તાળુ ખોલવુ જરૂરી"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1006,25 +1059,25 @@ msgid ""
 msgstr "તે વાપરી શકે તે પહેલાં મોબાઇલ બ્રોડબેન્ડ ઉપકરણ '%s' ને SIM PIN કોડની જરૂર છે."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN કોડ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN કોડ બતાવો"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK તાળુ ખોલવુ જરૂરી"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK તાળુ ખોલવુ જરૂરી"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1032,35 +1085,42 @@ msgid ""
 msgstr "તે વાપરી શકે તે પહેલાં મોબાઇલ બ્રોડબેન્ડ ઉપકરણ '%s' ને SIM PUK કોડની જરૂર છે."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK કોડ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "નવો PIN કોડ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "નવા PIN કોડને પુન:દાખલ કરો:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "જોડાણ જાણકારી"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1069,56 +1129,56 @@ msgstr ""
 "IP સરનામાંઓ નેટવર્ક પર તમારા કૉમ્પ્યુટરને ઓળખે છે.  IP સરનામાંને ઉમેરવા માટે \"Add\" બટન "
 "પરક્લિક કરો."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "કાઢી નાંખો (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "આપમેળે મેળવેલ માર્ગોને અવગણો (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "તેનાં નેટવર્ક પર સ્ત્રોતો માટે ફક્ત આ જોડાણને વાપરો (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "જો સક્રિય થયેલ હોય તો, આ જોડાણ એ મૂળભૂત નેટવર્ક જોડાણ તરીકે કદી વપરાશે નહિં."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "બનાવો..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "જોડાણ પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1130,85 +1190,100 @@ msgstr ""
 "ઇચ્છતા હોય તો VPN જોડાણનો પ્રકાર યાદીમાં દેખાતો નથી, તમારી પાસે યોગ્ય VPN પ્લગઇન "
 "સ્થાપિત થયેલ નથી."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "સેવા (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "રાઉન્ડ-રોબીન"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "બેકઅપ સક્રિય કરો"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "બ્રોડકાસ્ટ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "અનૂકુલનશીલ ટ્રાન્સમિટ લોડ સંતુલન"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "અનૂકુલનશીલ લોડ સંતુલન"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (અગ્રહણીય)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "બોન્ડ થયેલ જોડાણ (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "સ્થિતિ (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "ફેરફાર કરો (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "આવૃત્તિ દેખરેખ (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ઇન્ટરફેસ નામ (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "કડી દેખરેખ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP લક્ષ્ય (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1216,123 +1291,179 @@ msgstr ""
 "IP સરનામું, અથવા IP સરનામાંની અવતરણચિહ્નથી અલગ થયેલ યાદી, જ્યારે કડી સ્થિતિને ચકાસી "
 "રહ્યા હોય ત્યારે તે જોવા માટે."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "કડી ચાલુ થવામાં વિલંબ (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "કડી બંધ થવામાં વિલંબ (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "પ્રાથમિક (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MTU (_M):"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "બાઇટો"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "પ્રાધાન્ય (_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "બ્રિજ થયેલ જોડાણો (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "કડી બંધ થવામાં વિલંબ (_d):"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "નેટવર્કીંગને સક્રિય કરો (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "આપોઆપ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "સક્રિય"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1343,434 +1474,533 @@ msgstr ""
 "હાર્ડવેર સરનામાં તરીકે વાપરેલ હશે. આ લક્ષણ MAC ક્લોનિંગ અને સ્પુફીંગ તરીકે જાણીતુ છે.  "
 "ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "સરનામું"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "સરનામું"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ઇન્ટરફેસ નામ (_n):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "હાર્ડવેર સરનામું:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "કોઇપણ ઉપકરણ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "અજ્ઞાત ભૂલ દરમ્યાન જોડાણ ગુપ્તતાઓને સુધારવા માટે નિષ્ફળ."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "આ જોડાણ માટે Data Center Bridging (DCB) ને વાપરો"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "પ્રવાહ નિયંત્રણ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "લક્ષણ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "સક્રિય"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "પ્રાધાન્ય"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "વિકલ્પો..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "પ્રાધાન્ય જૂથ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "ફેબ્રીક"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "પ્રાધાન્ય પ્રવાહ નિયંત્રણ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "પ્રાધાન્ય:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
+msgstr ""
+
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
+msgstr ""
+
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
+msgstr "પ્રાધાન્ય"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "જૂથ ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "દરેક વપરાશકર્તા પ્રાધાન્ય માટે ટ્રાફિક વર્ગને દાખલ કરો."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "વપરાશકર્તા નામ (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "સેવા (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "પાસવર્ડને બતાવો (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "પાસવર્ડ (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ઇન્ટરફેસ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "આપોઆપ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "અવગણો"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "જાતે"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "પોર્ટ (_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "સેવા (_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "ક્લોન કરેલ MAC સરનામું (_l):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "અવગણો"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "બ્રોડકાસ્ટ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ઝડપ (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "સંપૂર્ણ ડૂપ્લેક્ષ (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "કંઇ નહિં"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "બધા વપરાશકર્તાઓ આ નેટવર્કમાં જોડાઇ શકે છે (_u)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "આ નેટવર્કમાં આપમેળે જોડાવો જ્યારે તે ઉપલબ્ધ છે (_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "આપમેળે આ ઉપકરણનું તાળુ ખોલો"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "જોડાણ જાણકારી (_I)"
+msgid "Firewall _zone"
+msgstr "ફાયરવોલ ઝોન (_z):"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "જૂથ થયેલ જોડાણો (_T):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "આપેમેળે જોડાવો (_a)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "ફાયરવોલ ઝોન (_z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1779,7 +2009,7 @@ msgstr ""
 "IP સરનામાંઓ નેટવર્ક પર તમારા કૉમ્પ્યુટરને ઓળખે છે.  IP સરનામાંને ઉમેરવા માટે \"Add\" બટન "
 "પરક્લિક કરો."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1787,128 +2017,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "ફક્ત સ્વયં સરનામાંઓ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "સરનામું"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ટ્રાન્સપોર્ટ સ્થિતિ (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ડેટાગ્રામ"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "જોડાયેલ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "ટ્રાન્સપોર્ટ સ્થિતિ (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ઉપકરણ નામ + નંબર"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ઇથરનેટ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "સ્થિતિ (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "મેન્યુઅલ DNS સુયોજનો સાથે આપમેળે"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "કડી-સ્થાનિક"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "બીજા કૉમ્પ્યુટરો સાથે વહેંચાયેલ છે"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "પદ્દતિ (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1919,8 +2153,8 @@ msgstr ""
 "વહીવટકર્તાને પરવાનગી આપે છે.  જો તમે DHCP ક્લાઇન્ટ ઓળખનારને વાપરવાનું ઇચ્છો તો, અહિંયા "
 "તેને દાખલ કરો."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1928,25 +2162,26 @@ msgstr ""
 "ડોમેઇન વાપરેલ છે જ્યારે યજમાન નામોને સુધારી રહ્યા હોય. ઘણાબધા ડોમેઇનને અલગ કરવા માટે "
 "અલ્પવિરામોને વાપરો."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP ક્લાઇન્ટ ID (_H):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "ડોમેઇનોને શોધો (_e):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS સર્વરો (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1954,11 +2189,11 @@ msgstr ""
 "યજમાનોને સુધારવા માટે વાપરેલ ડોમેઇન નામ સર્વરોનાં IP સરનામાંઓ. ઘણાબધા ડોમેઇન નામ સર્વર "
 "સરનામાંઓને અલગ કરવા માટે અલ્પવિરામને વાપરો."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "આ જોડાણને સમાપ્ત કરવા માટે IPv4 સરનામાંની જરૂર છે (_4)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1966,25 +2201,35 @@ msgstr ""
 "જ્યારે IPv6-સક્ષમ નેટવર્કોને જોડી રહ્યા હોય ત્યારે, સમાપ્ત કરવા માટે જોડાણને પરવાનગી આપે "
 "છે જો IPv4 રૂપરેખાંકન નિષ્ફળ જાય તો પરંતુ IPv6 રૂપરેખાંકન સફળ થાય છે."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "રસ્તો (_R)..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "નિષ્ક્રિય થયેલ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "સક્રિય"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -1993,15 +2238,20 @@ msgstr ""
 "યજમાનોને સુધારવા માટે વાપરેલ ડોમેઇન નામ સર્વરોનાં IP સરનામાંઓ. ઘણાબધા ડોમેઇન નામ સર્વર "
 "સરનામાંઓને અલગ કરવા માટે અલ્પવિરામને વાપરો.`"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6 ખાનગી ઍક્સટેન્શન (_p):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "સમાપ્ત કરવા આ જોડાણ માટે IPv6 સરનામાંની જરૂર છે (_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2009,753 +2259,860 @@ msgstr ""
 "જ્યારે IPv4-સક્ષમ નેટવર્કોને જોડી રહ્યા હોય ત્યારે, સમાપ્ત કરવા માટે જોડાણને પરવાનગી આપે "
 "છે જો IPv6 રૂપરેખાંકન નિષ્ફળ જાય તો પરંતુ IPv4 રૂપરેખાંકન સફળ થાય છે."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "મેટ્રીક"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "નિયાત કરો (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "નંબર (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "ઉન્નત"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "નેટવર્ક ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "બદલો..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "PIN (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "રોમિંગની પરવાનગી આપો જો ઘરનું નેટવર્ક ઉપલબ્ધ ન હોય તો (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "પાસવર્ડોને બતાવો (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "સત્તાધિકરણ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "પરવાનગી મળેલ પદ્દતિઓ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "પદ્દતિઓને રૂપરેખાંકિત કરો (_M)..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "દબાણ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "પોઇંટ-થી-પોઇંટ એનક્રિપ્શન (MPPE) ને વાપરો (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-bit એનક્રિપ્શનની જરૂર છે (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Stateful MPPE ને વાપરો (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD માહિતી સંકોચનને પરવાનગી આપો (_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Deflate માહિતા સંકોચનને પરવાનગી આપો (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP હેડર સંકોચનને વાપરો (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "પડઘો"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP ઇકો પેકેટોને મોકલો (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "પદ્દતિ (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_I)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "પદ્દતિ (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "ઉન્નત"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "વાયરવાળા નેટવર્કો"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "પ્રાધાન્ય (_P):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "પ્રાધાન્ય (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "પ્રાધાન્ય (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "ખાનગી કી (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "કડી ચાલુ થવામાં વિલંબ (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "કડી બંધ થવામાં વિલંબ (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP લક્ષ્ય (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP લક્ષ્ય (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_I)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "પ્રાધાન્ય"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ઇથરનેટ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "જૂથ થયેલ જોડાણો (_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ઇથરનેટ"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "હાર્ડવેર સરનામું:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "હાર્ડવેર સરનામું:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "પ્રાધાન્ય (_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ટ્રાન્સમિશન પાવર (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ટ્રાન્સમિશન પાવર (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ઇન્ટરફેસ નામ (_n):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "ક્લોન કરેલ MAC સરનામું (_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN id (_i):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ઉપકરણ નામ + નંબર"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + નંબર"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "સુરક્ષા (_e):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ટ્રાન્સમિશન પાવર (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "દર (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ચેનલ (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Band (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SSID (_I):"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "પરવાનગી આપેલ સત્તાધિકરણ પદ્દત્તિઓ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "વધારી શકાય તેવુ સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "પાસવર્ડ સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "માઇક્રોસોફ્ટ શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v2 (_2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "માઇક્રોસોફ્ટ શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ આવૃત્તિ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2764,440 +3121,479 @@ msgstr ""
 "મોટાભાગની સ્થિતિઓમાં, પોષણકર્તાનાં PPP સર્વરો એ બધી સત્તાધિકરણ પદ્દતિઓને આધાર આપશે. "
 "જો જોડાણો નિષ્ફળ થાય તો, અમુક પદ્દતિઓ માટે આધારને નિષ્ક્રિય કરવાનું પ્રયત્ન કરો."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "બ્લુટુથ"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ઇન્ફિનિબેન્ડ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "બોન્ડ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "જૂથ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "બ્રિજ"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN પલ્ગઇન એ યોગ્ય રીતે VPN જોડાણને આયાત કરવાનું નિષ્ફળ\n"
-"\n"
-"Error: VPN સેવા પ્રકાર નથી."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN જોડાણને આયાત કરી શકાતુ નથી"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ફાઇલ '%s' એ વાંચી શકાયુ નહિં અથવા ઓળખેલ VPN જોડાણ જાણકારીને સમાવતુ નથી\n"
+"VPN પલ્ગઇન એ યોગ્ય રીતે VPN જોડાણને આયાત કરવાનું નિષ્ફળ\n"
 "\n"
-"ભૂલ: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "અજ્ઞાત ભૂલ"
+"Error: VPN સેવા પ્રકાર નથી."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "આયાત કરવા માટે ફાઇલને પસંદ કરો"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "હાર્ડવેર"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "વર્ચ્યુઅલ"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "સંગ્રહ થયેલ VPN રૂપરેખાંકનને આયાત કરો..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "અજ્ઞાત ભૂલ દરમ્યાન જોડાણ સંપાદક સંવાદને પ્રારંભ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "નવા જોડાણમાં બનાવી શકાયુ નહિં"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "જોડાણ કાઢી નાખવાનું નિષ્ફળ"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "તમે ખરેખર જોડાણ %s ને કાઢી નાંખવાની ઇચ્છા રાખો છો?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN જોડાણો (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "સરનામું"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "નેટમાસ્ક"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ગેટવે"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "મેટ્રીક"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ઉપસર્ગ"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s માં ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "નામ વગરનાં જોડાણમાં ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "જોડાણ નામ (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "સંપાદકને પ્રારંભ કરતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "જોડાણ સંપાદક અમુક જરૂરી સ્રોતો શોધી શકી નહિં (.ui ફાઇલ મળી નથી)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "આ જોડાણ માટે કરેલ કોઇપણ બદલાવોને સંગ્રહો."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "આ મશીન નાં બધા વપરાશકર્તાઓ માટે આ જોડાણને સંગ્રહ કરવા માટે સત્તાધિકરણ કરો."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "જોડાણને બનાવી શક્યા નહિં"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "જોડાણમાં ફેરફાર કરી શકાયુ નહિં"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "જોડાણ સંપાદક સંવાદને બનાવતી વખતે અજ્ઞાત ભૂલ."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "સંપાદકને પ્રારંભ કરતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "જોડાણ નામ (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "નિકાસ કરો (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "લેબલ "
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "લેબલ "
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "કદી નહિં"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "હવે"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d મિનિટ પહેલા"
 msgstr[1] "%d મિનિટો પહેલા"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d કલાક અગાઉ"
 msgstr[1] "%d કલાકો અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day અગાઉ"
 msgstr[1] "%d દિવસો અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d મહિનાં અગાઉ"
 msgstr[1] "%d મહિનાઓ અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d વર્ષ અગાઉ"
 msgstr[1] "%d વર્ષો અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "જૂથ જોડાણ %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "જૂથ જોડાણ %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "નામ"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "છેલ્લે વપરાયેલ"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "પસંદ થયેલ જોડાણમાં ફેરફાર કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "પસંદ થયેલ જોડાણમાં ફેરફાર કરવા માટે સત્તાધિકરણ કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "પસંદ થયેલ જોડાણને કાઢી નાંખો"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "પસંદ થયેલ જોડાણને કાઢી નાંખવા માટે સત્તાધિકરણ કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "બિનઆધારભૂત મોબાઇલ બ્રોડબેન્ડ જોડાણ પ્રકાર."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "જાણતા નથી કેવી રીતે '%s' જોડાણોને બનાવવા"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "જોડાણને બનાવતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "VPN પ્લગઇન સ્થાપિત થયેલ નથી."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "જાણતા નથી કેવી રીતે '%s' જોડાણોને બનાવવા"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' સાથે જોડાણને શોધી શક્યા નથી"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "નેટવર્ક જોડાણો"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN જોડાણો (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X સુરક્ષા"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "આ જોડાણ માટે 802.1X સુરક્ષાને વાપરો (_X)"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "DCB વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "બ્લુટુથ ઉપકરણને શોધી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "બોન્ડ જોડાણ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "બ્લુટુથ"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "વાયરવાળુ નેટવર્ક"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi નેટવર્ક"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "બોન્ડ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "પ્રાથમિક (_P):"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "બોન્ડ જોડાણ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "બ્રિજ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "બ્રિજ જોડાણ %d"
@@ -3205,32 +3601,37 @@ msgstr "બ્રિજ જોડાણ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "બ્રિજ પોર્ટ"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "બ્રિજ પોર્ટ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL જોડાણ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3240,55 +3641,54 @@ msgstr ""
 "આ વિકલ્પ એ અહિંયા દાખલ થયેલ MAC સરનામાં દ્દારા સ્પષ્ટ થયેલ નેટવર્ક ઉપકરણ માટે આ જોડાણને "
 "તાળુ મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "અવગણેલ"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ઇથરનેટ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ઇથરનેટ"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "ક્લોન કરેલ MAC સરનામું (_l):"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ઇથરનેટ જોડાણ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "સામાન્ય વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3299,183 +3699,187 @@ msgstr ""
 "આ વિકલ્પ એ અહિંયા દાખલ થયેલ MAC સરનામાં દ્દારા સ્પષ્ટ થયેલ નેટવર્ક ઉપકરણ માટે આ જોડાણને "
 "તાળુ મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand જોડાણ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 વપરાશકર્તા ઇન્ટરફેલને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ઇથરનેટ જોડાણ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "સ્વયં (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "ફક્ત સ્વયં (VPN) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ફક્ત સ્વયં સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "સ્વયં (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ફક્ત સ્વયં (PPPoE) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "સ્વયં (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "ફક્ત સ્વયં (DHCP) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "ફક્ત સ્થાનીય કડી કરો"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "વધારાનાં DNS સર્વરો (_v):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "વધારાનાં શોધ ડોમેઇન (_e):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s માટે IPv4 માર્ગોને ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 સુયોજનો"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 વપરાશકર્તા ઇન્ટરફેલને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "સ્વયં, DHCP ફક્ત"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s માટે IPv6 માર્ગોને ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 સુયોજનો"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX જોડાણ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "નકલી સ્લેવ"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s સ્લેવ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "મોબાઇલ બ્રોડબેન્ડ વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "બિનઆધારભૂત મોબાઇલ બ્રોડબેન્ડ જોડાણ પ્રકાર."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3484,7 +3888,7 @@ msgstr ""
 "તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા વાપરે છે તેને પસંદ કરો.  જો તમે ચોક્કસ ન હોય તો, "
 "તમારા પોષણકર્તાને પૂછો."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "મારો પોષણકર્તા એ GSM-આધારિત ટેકનોલોજી ને વાપરે છે (_G) (એટલે કે. GPRS, EDGE, UMTS, "
@@ -3492,85 +3896,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "મારો પોષણકર્તા એ CDMA-આધારિત ટેકનોલોજી ને વાપરે છે (_D) (એટલે કે. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "કંઇ નહિં"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s માટે PPP સત્તાધિકરણ પદ્દતિઓમાં ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP સુયોજનો"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "બોન્ડ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "ભૂલ: ફાઇલ યોગ્ય JSON રૂપરેખાંકનને સમાવતુ નથી"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "જૂથ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "જૂથ જોડાણ %d"
@@ -3578,69 +3978,69 @@ msgstr "જૂથ જોડાણ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "જૂથ પોર્ટ"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (\"%s\" મારફતે)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "નેટવર્ક જોડાણ નથી"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "vlan વપરાશકર્તા ઇન્ટરફેસ લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN જોડાણ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' માટે VPN પ્લગઇન સેવાને શોધી શકાયુ નહિં."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' માટે VPN પ્લગઇન સેવાને શોધી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "જોડાણ નિષ્ફળ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' માટે VPN પ્લગઇન સેવાને શોધી શકાયુ નહિં."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN જોડાણ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN જોડાણ પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3651,7 +4051,7 @@ msgstr ""
 "ઇચ્છતા હોય તો VPN જોડાણનો પ્રકાર યાદીમાં દેખાતો નથી, તમારી પાસે યોગ્ય VPN પ્લગઇન "
 "સ્થાપિત થયેલ નથી."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3660,7 +4060,7 @@ msgstr ""
 "અહિંયા દાખલ થયેલ BSSID દ્દારા સ્પષ્ટ થયેલ વાયરલેસ પ્રવેશ બિંદુ (AP) માટે આ જોડાણને તાળુ "
 "મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3670,94 +4070,92 @@ msgstr ""
 "આ વિકલ્પ એ અહિંયા દાખલ થયેલ MAC સરનામાં દ્દારા સ્પષ્ટ થયેલ નેટવર્ક ઉપકરણ માટે આ જોડાણને "
 "તાળુ મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "કોઇપણ ઉપકરણ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi જોડાણ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit કી (Hex અથવા ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-બીટ પાસફ્રેઝ"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ગતિક WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 એન્ટરપ્રાઇઝ"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Wi-Fi સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં; ગુમ થયેલ Wi-Fi સુયોજન."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi સુરક્ષા"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "નામ થયેલ ફાઇલ \"%s\" પહેલેથી જ અસ્તિત્વ ધરાવે છે."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "બદલો (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "શું તમે સંગ્રહ કરી રહ્યા છો તે VPN જોડાણ સાથે %s ને બદલવા માંગો છો?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN જોડાણનું નિકાસ કરી શકાતુ નથી"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3768,222 +4166,106 @@ msgstr ""
 "\n"
 "ભૂલ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN જોડાણની નિકાસ કરો..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "તાળુ ખોલો (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "આપમેળે આ ઉપકરણનું તાળુ ખોલો"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "જોડાણ જાણકારી"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "નેટવર્ક જોડાણો સક્રિય કરો"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "ખાનગી કી (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "તમારુ મોબાઇલ બ્રોડબેન્ડ જોડાણ એ નીચેનાં સુયોજનો સાથે રૂપરેખાંકિત થયેલ છે:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "તમારુ ઉપકરણ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "તમારો પોષણકર્તા:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "તમારો પ્લાન:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"જોડાણ એ તમે પસંદ કરેલ છે તે સુયોજનોની મદદથી તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા માટે હવે "
-"બનાવેલ હશે.  જો જોડાણ નિષ્ફળ થાય તો અથવા તમે નેટવર્ક સ્ત્રોતોને દાખલ કરી શકતા ન હોય "
-"તો, તમારા સુયોજનોને બે વાર ચકાસો.  તમારા મોબાઇલ બ્રોડબેન્ડ જોડાણ સુયોજનોને બદલવા "
-"માટે, સિસ્ટમ >> પસંદગીઓ મેનુ માંથી \"Network Connections\" ને પસંદ કરો."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "મારો દેશ યાદી થયેલ નથી"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "યાદી ન થયેલ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "તમારા પ્લાનને પસંદ કરો (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "પસંદ થયેલ પ્લાન APN (Access Point Name) (_A):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"ચેતવણી: અયોગ્ય પ્લાન પસંગ કરવા દરમ્યાન તમારા બ્રોડબેન્ડ ખાતા માટે બિલીંગ મુદ્દાઓને પરિણમી "
-"શકે છે અથવા જોડાણને અટકાવી શકે છે.\n"
-"\n"
-"જો તમારા પ્લાનની ખાતરી ન હોય તો મહેરબાની કરીને તમારા પ્લાનનાં APN માટે તમારા "
-"પોષણકર્તાને પૂછો."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "તમારા બિલીંગ પ્લાનને પસંદ કરો"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "મારો પ્લાન યાદી થયેલ નથી..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "યાદી માંથી તમારા પોષણકર્તાને પસંદ કરો (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "પોષણકર્તા"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr ""
-"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "પોષણકર્તા:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "મારો પોષણકર્તા એ GSM ટેકનોલોજી ને વાપરે છે (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "મારો પોષણકર્તા એ CDMA ટેકનોલોજીને વાપરે છે (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "તમારા પોષણકર્તાને પસંદ કરો"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ) યાદી:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "મારો દેશ યાદી થયેલ નથી"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "તમારા પોષણકર્તાનાં દેશ અથવા પ્રાન્ત (પ્રદેશ) પસંદ કરો"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "સ્થાપિત થયેલ GSM ઉપકરણ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "સ્થાપિત થયેલ CDMA ઉપકરણ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "કોઇપણ ઉપકરણ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -3991,223 +4273,302 @@ msgstr ""
 "આ મદદકર્તા એ તમને સેલ્યુલર (3G) નેટવર્કમાં મોબાઇલ બ્રોડબેન્ડ જોડાણને સુયોજન કરવાનું સરળ "
 "બનાવવા માટે મદદ કરે છે."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "તમારે નીચેની જાણકારીની જરૂર પડશે:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "તમારુ બ્રોડબેન્ડ પોષણકર્તાનું નામ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન નામ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(અમુક સ્થિતિઓમાં) તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "આ મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે જોડાણને બનાવો (_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "કોઇપણ ઉપકરણ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ ને સુયોજિત કરો"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "તમારા પોષણકર્તાનાં દેશ અથવા પ્રાન્ત (પ્રદેશ) પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "યાદી માંથી તમારા પોષણકર્તાને પસંદ કરો (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "મારો પોષણકર્તા એ GSM ટેકનોલોજી ને વાપરે છે (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "મારો પોષણકર્તા એ CDMA ટેકનોલોજીને વાપરે છે (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "તમારા પોષણકર્તાને પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "તમારા પ્લાનને પસંદ કરો (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "પસંદ થયેલ પ્લાન APN (Access Point Name) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"ચેતવણી: અયોગ્ય પ્લાન પસંગ કરવા દરમ્યાન તમારા બ્રોડબેન્ડ ખાતા માટે બિલીંગ મુદ્દાઓને પરિણમી "
+"શકે છે અથવા જોડાણને અટકાવી શકે છે.\n"
+"\n"
+"જો તમારા પ્લાનની ખાતરી ન હોય તો મહેરબાની કરીને તમારા પ્લાનનાં APN માટે તમારા "
+"પોષણકર્તાને પૂછો."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "તમારા બિલીંગ પ્લાનને પસંદ કરો"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "તમારુ મોબાઇલ બ્રોડબેન્ડ જોડાણ એ નીચેનાં સુયોજનો સાથે રૂપરેખાંકિત થયેલ છે:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "તમારુ ઉપકરણ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "તમારો પોષણકર્તા:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "તમારો પ્લાન:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"જોડાણ એ તમે પસંદ કરેલ છે તે સુયોજનોની મદદથી તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા માટે હવે "
+"બનાવેલ હશે.  જો જોડાણ નિષ્ફળ થાય તો અથવા તમે નેટવર્ક સ્ત્રોતોને દાખલ કરી શકતા ન હોય "
+"તો, તમારા સુયોજનોને બે વાર ચકાસો.  તમારા મોબાઇલ બ્રોડબેન્ડ જોડાણ સુયોજનોને બદલવા "
+"માટે, સિસ્ટમ >> પસંદગીઓ મેનુ માંથી \"Network Connections\" ને પસંદ કરો."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(કંઇ નહિં)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA પ્રમાણપત્ર (_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "અજ્ઞાત"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "વપરાશકર્તા પ્રમાણપત્ર (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "તાળુ ખોલો (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "આ વપરાશકર્તા માટે ફક્ત પાસવર્ડને સંગ્રહો (_u)"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "બધા વપરાશકર્તાઓ માટે પાસવર્ડને સંગ્રહો (_a)"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "દરેક સમયે આ પાસવર્ડ માટે પૂછો (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "પાસવર્ડ ને '%s' માં જોડાવાની જરૂરિયાત છે."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "ગૌણ પાસવર્ડ (_S):"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "પાસવર્ડોને બતાવો (_o)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ગૌણ પાસવર્ડ (_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "પાસવર્ડોને બતાવો (_o)"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ગૌણ પાસવર્ડ (_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "પાસવર્ડ (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "જોડાણ તોડી નાંખો"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ગતિક WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "બનાવો (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "પાસવર્ડ અથવા એનક્રિપ્શન કીને Wi-Fi નેટવર્ક '%s' ને વાપરવાની જરૂર છે."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi નેટવર્ક સત્તાધિકરણ જરૂરી"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi નેટવર્ક દ્દારા સત્તાધિકરણ જરૂરી"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "નવું Wi-Fi નેટવર્ક"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Wi-Fi નેટવર્ક માટે નામને દાખલ કરો જે તમે બનાવવા ઇચ્છો છો."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4215,35 +4576,56 @@ msgid ""
 msgstr ""
 "તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ કરો."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "વાયરલેસ સુરક્ષા (_s):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "જોડાણ (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi એડપ્ટર (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "પોષણકર્તા:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ) યાદી:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "વાયરવાળુ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC મેશ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4253,17 +4635,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "વાયરલેસ સુરક્ષા (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "નેટવર્ક નામ (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "જોડાણ (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi એડપ્ટર (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "વપરાશ:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4271,419 +4675,485 @@ msgstr ""
 "આ પ્રક્રિયા એ NetworkManager નો ઘટક છે (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "તે આદેશ-વાક્ય સંપર્ક માટે હેતુપૂર્વક કરેલ નથી પરંતુ તેને બદલે GNOME ડેસ્કટોપ પર્યાવરણમાં ચાલે છે."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "સક્રિય થયેલ નથી"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "રજીસ્ટર થયેલ નથી"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ઘર નેટવર્ક (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ઘર નેટવર્ક"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "શોધી રહ્યા છે"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "રજીસ્ટ્રેશન નામંજૂર થયેલ છે"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s રોમિંગ)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (રોમિંગ)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "રોમિંગ નેટવર્ક (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "રોમિંગ નેટવર્ક"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%s' પર SIM કાર્ડ '%s' માટે PIN કોડ"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN કોડની જરૂરિયાત છે"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે PIN કોડની જરૂર છે"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' સક્રિય: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "રોમિંગ"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s જોડાણ"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER અથવા PEM પ્રમાણપત્રો (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, અથવા PKCS#12 ખનગી કી (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ફાઇલને પસંદ કરો..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ફાઇલો (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "બધી ફાઇલો"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "અનામિક"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "સત્તાધિકરણ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "બંને"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "અવ્યવસ્થિત રીતે ઓળખો (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC ફાઇલ (_f):"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "આંતરિક સત્તાધિકરણ (_I):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "આપોઆપ PAC બચાવ માટે પરવાનગી આપે છે (_v)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Certificate Authority પ્રમાણપત્ર ને પસંદ કરો..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "આવૃત્તિ 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "આવૃત્તિ 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA પ્રમાણપત્ર (_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP આવૃત્તિ (_v):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-બીટ પાસફ્રેઝ"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "પાસવર્ડોને બતાવો (_o)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ઓળખાણપત્ર (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ટનલ થયેલ TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "સુરક્ષિત થયેલ EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "સત્તાધિકરણ (_t):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (મૂળભૂત)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "સિસ્ટમને ખોલો"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "વહેંચાયેલ કી"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (મૂળભૂત)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "કી (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "કીને બતાવો (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP અનુક્રમણિકા (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "પ્રકાર (_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (મૂળભૂત)"
+
+#~ msgid "Ignored"
+#~ msgstr "અવગણેલ"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "અજ્ઞાત ભૂલ દરમ્યાન જોડાણ ગુપ્તતાઓને સુધારવા માટે નિષ્ફળ."
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "આ નેટવર્કમાં આપમેળે જોડાવો જ્યારે તે ઉપલબ્ધ છે (_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "જોડાણ જાણકારી (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN જોડાણને આયાત કરી શકાતુ નથી"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ફાઇલ '%s' એ વાંચી શકાયુ નહિં અથવા ઓળખેલ VPN જોડાણ જાણકારીને સમાવતુ નથી\n"
+#~ "\n"
+#~ "ભૂલ: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "અજ્ઞાત ભૂલ"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Certificate Authority પ્રમાણપત્ર ને પસંદ કરો..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA પ્રમાણપત્ર (_A):"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "નેટવર્ક વ્યવસ્થાપક"
@@ -4718,30 +5188,6 @@ msgstr "પ્રકાર (_T):"
 #~ 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"
 
@@ -5011,14 +5457,6 @@ msgstr "પ્રકાર (_T):"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "ફક્ત સ્વયં (PPP) સરનામાંઓ"
 
-#~| msgid "Could not load Wi-Fi user interface."
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
-
-#~| msgid "Wired connection %d"
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX જોડાણ %d"
-
 #~| msgid ""
 #~| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 #~ msgid ""
@@ -5043,9 +5481,6 @@ msgstr "પ્રકાર (_T):"
 #~ msgid "Error: %s"
 #~ msgstr "ભૂલ: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "તમારો ફોન એ હવે વાપરવા માટે તૈયાર છે!"
 
@@ -5116,12 +5551,6 @@ msgstr "પ્રકાર (_T):"
 #~ msgid "Wireless network connection '%s' active"
 #~ msgstr "વાયરલેસ નેટવર્ક જોડાણ '%s' સક્રિય છે"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ગૌણ DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ટર્નરિ DNS:"
-
 #~ msgid "Could not load Wired Security security user interface."
 #~ msgstr "Wired Security સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
@@ -5134,12 +5563,6 @@ msgstr "પ્રકાર (_T):"
 #~ msgid "_Save..."
 #~ msgstr "સંગ્રહો (_S)..."
 
-#~ msgid "_Import"
-#~ msgstr "નિયાત કરો (_I)"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "આપેમેળે જોડાવો (_a)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "બધા વપરાશકર્તાઓ માટે ઉપલ્બધ"
 
diff --git a/po/he.po b/po/he.po
index 15cc6c06..a375a1f4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-03-16 16:19+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Gezer (Hebrew)\n"
@@ -19,47 +20,56 @@ msgstr ""
 "X-Generator: Poedit 1.5.4\n"
 "X-Launchpad-Export-Date: 2010-11-02 07:32+0000\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "רשת"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "ניהול חיבורי הרשת שלך"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "חיבורי רשת"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "חיבורי חשת פעילים"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "ניהול ושינוי הגדרות חיבורי הרשת שלך"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Disable connected notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Set this to true to disable notifications when connecting to a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Disable disconnected notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Set this to true to disable notifications when disconnecting from a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Disable VPN notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -67,49 +77,50 @@ msgstr ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Suppress networks available notifications"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stamp"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Used to determine whether settings should be migrated to a new version."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Disable Wi-Fi Create"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Set to true to disable creation of adhoc networks when using the applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Show the applet in notification area"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Set to FALSE to disable displaying the applet in the notification area."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignore CA certificate"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -117,7 +128,7 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -125,130 +136,143 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "מנהל הרשתות"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "אין חיבור רשת"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "יישומון מנהל הרשתות"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "אימות 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "ה_תחברות"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "שם ה_רשת:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "ייעודי (Ad-hoc)"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "הוספת/הפעלת החיבור נכשלה"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "שגיאה בלתי מוכרת"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "ההתקשרות נכשלה"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ניתוק ההתקן נכשל"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "הניתוק נכשל"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "הפעלת החיבור נכשלה"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "אין להציג הודעה זאת שוב"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -258,7 +282,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' התנתק מכיוון שחיבור הרשת הופרע."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל שחיבור הרשת נקטע."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל ששירות ה־VPN הופסק בפתאומיות."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל ששירות ה־VPN החזיר תצורה לא תקינה."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל משום שתם הזמן המוקצב לחיבור."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל מכיוון ששירות ה־VPN לא התחיל בזמן."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל מכיוון שהפעלת שירות ה־VPN נכשלה."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל עקב העדר סודות VPN תקפים."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל סודות VPN שגויים."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "חיבור ה־VPN נוצר בהצלחה.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "הודעת כניסה ל־VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "חיבור VPN נכשל"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -377,7 +401,7 @@ msgstr ""
 "\n"
 "'%s'"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,562 +414,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ההתקן אינו מוכן (חסרה קושחה)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ההתקן אינו מוכן"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "מנותק"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "הנתקות"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ההתקן לא מנוהל"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "לא נמצא התקן רשת זמין"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_חיבורי VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "ה_גדרת VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_חיבורי VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "מנהל הרשתות אינו פעיל..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "מנהל הרשתות כבוי"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "הפעלת _חיבורי רשת"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "הפעלת ת_קשורת רשת אלחוטית"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "הפעלת פס _רחב נייד"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "הפעלת הה_תרעות"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_פרטי החיבור"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "עריכת חיבורים..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "התחברת כעת אל '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "נותק"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "חיבור הרשת נותק."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "חיבור הרשת '%s' בהכנות..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "נדרש אימות משתמש עבור חיבור הרשת ‏'%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "מתבקשת כתובת רשת עבור '%s'...."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "חיבור הרשת '%s' פעיל"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "חיבור ה־VPN ‏'%s' מופעל..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "נדרש אימות משתמש עבור חיבור ה־VPN ‏'%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "מתבקשת כתובת VPN עבור ‏'%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "חיבור ה־VPN‏ '%s' פעיל"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "אין חיבור רשת"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "יישומון מנהל הרשתות"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "קוד ה־PUK שגוי; נא ליצור קשר עם הספק שלך."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "קוד ה־PIN שגוי; נא ליצור קשר עם הספק שלך."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "נשלח קוד שחרור..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "פס רחב נייד (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "פס רחב נייד"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "זמין"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "חיבור פס רחב נייד חדש"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "החיבור נוצר"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "רשת הפס הרחב הנייד מחוברת כעת."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "רשת פס רחב נייד."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "נרשמת כעת לרשת הביתית."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "נרשמת כעת לרשת נדידה."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "רשת הפס הרחב הנייד מחוברת כעת."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "חיבור הפס הרחב הנייד '%s' בהכנות..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "הגדרת התצורה של חיבור הפס הרחב הנייד '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "נדרש אימות מהמשתמש עבור חיבור הפס הרחב הנייד '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "חיבור הפס הרחב הנייד '%s' פעיל"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "‏אתרנט אוטומטי"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "רשתות קוויות (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "רשת קווית (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "רשתות קוויות"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "רשת קווית"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "התחברת כעת לרשת הקווית."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "חיבור הרשת הקווית '%s' בהכנות..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "תצורת חיבור הרשת הקווית '%s' מוגדרת..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "נדרש אימות מהמשתמש עבור חיבור הרשת הקווית '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "מתבקשת כתובת לרשת הקווית עבור '%s'...."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "החיבור לרשת הקווית '%s' פעיל"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "אימות DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "התחברות לרשת אלחוטית סמויה"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "יצירת רשת אלחוטית חדשה"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(אין)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "הוספת החיבור החדש נכשלה"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "רשתות אלחוטיות (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "רשת אלחוטית (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "רשת אלחוטית"
 msgstr[1] "רשתות אלחוטיות"
 msgstr[2] "2 רשתות אלחוטיות"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "הרשת האלחוטית מנוטרלת"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "התקשורת האלחוטית מנוטרלת באמצעות מתג חומרה"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "רשתות נוספות"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "רשתות אלחוטיות זמינות"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ניתן להשתמש בתפריט הרשתות כדי להתחבר לרשת אלחוטית"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "התחברת כעת לרשת האלחוטית '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "חיבור הרשת '%s' בהכנות..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "תצורת חיבור הרשת האלחוטית '%s' מוגדרת..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "נדרש אימות מהמשתמש עבור חיבור הרשת האלחוטית '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "מתבקשת כתובת רשת אלחוטית עבור '%s'...."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "חיבור הרשת האלחוטית '%s' פעיל: %s ‏(%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "החיבור לרשת האלחוטית '%s' פעיל"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "הפעלת ההתקשרות נכשלה"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "שגיאה בהצגת נתוני החיבור:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "‏WEP דינמי"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "כתובות"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "אין"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (בררת מחדל)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u מסל״ש"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "כתובת IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "כתובת השידור"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "מסכת רשת משנה"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "כתובת DNS ראשית:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "כתובת DNS משנית:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS שלישי:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "כללי"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "מנשק"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "כתובת חומרה"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "מנהל התקן"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "מהירות"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "אבטחה"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "נתיב בררת המחדל"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "בהתעלמות"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ססמה:‏"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "סוג ה־VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "שער הגישה ל־VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "שם המשתמש ב־VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "הכרזת ה־VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "התקשרות הבסיס"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "לא נמצאו חיבורים פעילים תקינים!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -953,48 +1002,65 @@ msgstr ""
 "כל הזכויות שמורות © 2008-2005 Novell בע״מ.\n"
 "ותורמים ומתרגמים רבים ומגוונים מהקהילה"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "יישומון המנהל את התקני וחיבורי הרשת."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "אתר הבית של מנהל הרשתות"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"מארק קרפיבנר <mark125@gmail.com>\n"
+"Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"\n"
+"פרויקט תרגום GNOME לעברית:\n"
+"‏http://gnome-il.berlios.de\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Ddorda https://launchpad.net/~ddorda\n"
+"  Michael Gefen https://launchpad.net/~gefenm11\n"
+"  Shlomil https://launchpad.net/~shlomister\n"
+"  Yaron https://launchpad.net/~sh-yaron\n"
+"  itai_lahat https://launchpad.net/~itailahat\n"
+"  kulight https://launchpad.net/~kulight"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "יישומון מנהל הרשתות לא מצא חלק מהמשאבים הדרושים (קובץ ה־‎.ui לא נמצא)"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "משאבים חסרים"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ססמת רשת פס רחב נייד"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "נדרשת ססמה כדי להתחבר ל־'%s'."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ססמה:‏"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "נדרש שחרור ה־PIN של ה־SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "נדרש שחרור ה־PIN של ה־SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1070,25 @@ msgstr ""
 "בו."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "קוד PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "הצגת קוד PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "נדרש שחרור ה־PUK של ה־SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "נדרש שחרור ה־PUK של ה־SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1032,35 +1098,42 @@ msgstr ""
 "בו."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "קוד PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "קוד PIN חדש:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "הזנת קוד ה־PIN החדש שוב:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "הצגת הקודים 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "פרטי החיבור"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "אירע כשל ביצירת חיבור בהתקשרות: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1069,56 +1142,56 @@ msgstr ""
 "כתובות IP מהוות זיהוי למחשב שלך ברשת. יש ללחוץ על \"הוספה\" כדי להוסיף כתובת "
 "IP:"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "מ_חיקה"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ה_תעלמות מנתיבים שהתקבלו אוטומטית"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_יש להשתמש בחיבור זה רק עבור משאבים ברשת הפרטי שלו"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "אם נבחר, חיבור זה לא ישמש כחיבור בררת מחדל"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "יצירה..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "נא לבחור את סוג החיבור"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1130,85 +1203,100 @@ msgstr ""
 "אם סוג חיבור המבוקש הוא VPN וה־VPN שברצונך ליצור אינו מופיע ברשימה, יתכן שלא "
 "מותקן אצלך תוסף ה־VPN המתאים."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_שירות:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "גיבוי פעיל"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "שידור"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "איזון עומס העברה מסתגל"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "איזון עומס מסתגל"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (מומלץ)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "חיבורים מאו_גדים:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "מ_צב:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "תדירות מ_עקב:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "מילישניות"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "שם המ_נשק:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "מ_עקב אחר קשר:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "י_עדי ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1216,124 +1304,184 @@ msgstr ""
 "כתובת IP או רשימה מופרדת בפסיקים של כתובות IP, אחריהן יש לחפש בעת בדיקת מצב "
 "הקישוריות."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "השהיית ה_פעלת החיבור:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "השהיית _ניתוק החיבור:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "כתובת DNS ראשית:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "בתים"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_עלות נתיב:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "מצב _סיכה:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "חיבורים מגושרים:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "השהיית ה_עברה:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "זמן _שלום:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "שנ׳"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "הפעלת _חיבורי רשת"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "ה_פעלת STP (פרוטוקול עץ משתרע)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "הגיל המ_רבי:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "גיל ההז_דקנות:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "אוטומטי"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "בררת מחדל"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "הפעלה"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1343,438 +1491,533 @@ msgstr ""
 "כתובת ה־MAC שהוזנה כאן תשמש ככתובת החומרה עבור התקן הרשת שחיבור זה מופעל "
 "דרכו. תכונה זו ידועה כשכפול או זיוף  MAC. לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "כתובת"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "כתובת"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "שם מנשק ה־VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "כתובת חומרה:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "התקן כלשהו"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "אירע כשל בעדכון סודות החיבור עקב שגיאה בלתי ידועה."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "שימוש באבטחת _‎8021.X עבור חיבור זה"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "הפעלה"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "עדיפות"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "אפשרויות"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "קבוצות עדיפות"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "עדיפות:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "שם _משתמש:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_שירות:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "הצ_גת ססמה"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_ססמה:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "מנשק"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "מ_נשק ההורה:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "מ_נשק ההורה:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "זוג שזור (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "מנשק יחידת צירוף (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "מנשק מדיה עצמאי (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 מסל״ש"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 מסל״ש"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "גסל״ש אחד"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 ג״ב/ש׳"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "התעלמות"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ידני"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_פתחה:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_שירות:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "כתובת ה־MAC המ_שוכפלת:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ססמת מפתח _פרטי:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "בררת מחדל"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "התעלמות"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "שידור"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ססמת מפתח _פרטי:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_מהירות:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "תקשורת דו־כיווני_ת מלאה"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "יש להתחבר או_טומטית ל־VPN בעת השימוש בחיבור זה"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "כן"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "לא"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "כל המשתמשים יכולים להתחבר לרשת זו"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "יש להתחבר לרשת זו אוטומטית כאשר היא _זמינה"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "יש להתחבר או_טומטית ל־VPN בעת השימוש בחיבור זה"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_פרטי החיבור"
+msgid "Firewall _zone"
+msgstr "_אזור חומת האש:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "חיבורים מאו_גדים:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "התחברות אוטו_מטית"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_אזור חומת האש:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1783,7 +2026,7 @@ msgstr ""
 "כתובות IP מהוות זיהוי למחשב שלך ברשת. יש ללחוץ על \"הוספה\" כדי להוסיף כתובת "
 "IP:"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1791,128 +2034,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "אוטומטי כתובות בלבד"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "כתובות"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "מ_צב העברה:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "יחידת נתונים (ללא מעקב)"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "קיים חיבור"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "מ_צב העברה:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "שם ההתקן + מספר"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "רשת קווית"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "מ_צב:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "אוטומטי עם הגדרות DNS ידניות"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "קישור מקומי"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "משותף למחשבים אחרים"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_שיטה"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1922,8 +2169,8 @@ msgstr ""
 "מזהה לקוח ה־DHCP מאפשר למנהל הרשת שלך להתאים את תצורת המחשב שלך. אם ברצונך "
 "להשתמש במזהה לקוח DHCP יש להזין אותו כאן."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1931,25 +2178,26 @@ msgstr ""
 "שמות מתחם המשמשים לפתרון שמות מארחים. יש להשתמש בפסיקים כדי להפריד מספר שמות "
 "מתחם."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "מזהה לקוח D_HCP:‏"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "מתחמי _חיפוש:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "שרתי _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1957,11 +2205,11 @@ msgstr ""
 "כתובת IP של שמות מתחם המשתמשים לפתרון שמות מאחרים. יש להשתמש בפסיקים כדי "
 "להפריד מספר כתובות שמות מתחם."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "יש צורך בחלוקת כתובות IPv_4 כדי להשלים חיבור זה"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1969,25 +2217,35 @@ msgstr ""
 "בעת התחברות לרשתות תומכות IPv6 השלמת החיבור תתאפשר אם תצורת ה־IPv4 תיכשל אך "
 "תצורת ה־IPv6 תצליח."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_נתיבים…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "מנוטרל"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "הפעלה"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1997,15 +2255,19 @@ msgstr ""
 "כתובת IP של שמות מתחם המשתמשים לפתרון שמות מאחרים. יש להשתמש בפסיקים כדי "
 "להפריד מספר כתובות שמות מתחם."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "יש צורך בחלוקת כתובות IPv_6 כדי להשלים חיבור זה"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2013,755 +2275,861 @@ msgstr ""
 "בעת התחברות לרשתות תומכות IPv4 השלמת החיבור תתאפשר אם תצורת ה־IPv6 תיכשל אך "
 "תצורת ה־IPv4 תצליח."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "מטרית"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "י_בוא"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "מס_פר:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "‏_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "מזהה הר_שת:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "שינוי..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "מתן אפשרות ל_נדידה אם הרשת הביתית לא זמינה"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "הצ_גת ססמאות"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "אימות"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "שיטות מותרות:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "הגדרת _שיטות..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "כיווץ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_שימוש בהצפנה מקצה לקצה (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_דרישת הצפנת ‎128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_שימוש ב־stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "הפעלת כיווץ מידע  _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "הפעלת _פריסת נתונים דחוסים"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "שימוש ב_דחיסת כותרות TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "הד"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "שליחת חבילות ה_ד של PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_שיטה"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "אין"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "יבוא תצורת חיבור VPN שנשמרה..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_שיטה"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "מתקדם"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "רשתות קוויות"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "עדיפות:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_מפתח פרטי:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "השהיית ה_פעלת החיבור:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "השהיית _ניתוק החיבור:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "י_עדי ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "י_עדי ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "יבוא תצורת חיבור VPN שנשמרה..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "עדיפות"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "רשת קווית"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "חיבורים מאו_גדים:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "רשת קווית"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "כתובת חומרה:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "כתובת חומרה:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "עצ_מת השידור:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "עצ_מת השידור:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "מ_נשק ההורה:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "שם מנשק ה־VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "כתובת ה־MAC המ_שוכפלת:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "מ_זהה ה־VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "שם ההתקן + מספר"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + מספר"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "א_בטחה:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ייעודי (Ad-hoc)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "עצ_מת השידור:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "מסל״ש"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_קצב:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "‏_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_ערוץ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_ערוץ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "שיטות האימות המורשות"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "פרוטוקול אימות בר הרחבה"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "פרוטוקול אימות סיסמה"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "פרוטוקול אימות אתגר לחיצת יד"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "פרוטוקול אימות אתגר לחיצת-יד של מיקרוסופט"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "פרוטוקול אימות אתגר לחיצת-יד של מיקרוסופט גירסה 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2770,240 +3138,233 @@ msgstr ""
 "ברוב המקרים, שרתי ה־PPP של הספק יתמכו בכל שיטות האימות. אם החיבור נכשל, יש "
 "לנסות לבטל חלק מהשיטות."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "רשת אלחוטית"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "מאגד"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "גשר"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"תוסף ה־VPN נכשל ביבוא החיבור כהלכה\n"
-"\n"
-"שגיאה: אין סוג שירות VPN ."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "לא ניתן לייבא חיבור VPN"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"הקובץ '%s לא ניתן לקריאה כיוון שהוא לא מכיל נתוני חיבור VPN מזוהים\n"
+"תוסף ה־VPN נכשל ביבוא החיבור כהלכה\n"
 "\n"
-"שגיאה: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "שגיאה בלתי מוכרת"
+"שגיאה: אין סוג שירות VPN ."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "בחירת קובץ לייבוא"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "וירטואלי"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "יבוא תצורת חיבור VPN שנשמרה..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "אתחול תיבת הדו־שיח של עורך ההתחברות לא צלח בשל שגיאה לא מוכרת."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "לא ניתן ליצור חיבור חדש"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "מחיקת החיבור נכשלה"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "האם ברצונך למחוק את החיבור %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_חיבורי VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "כתובת"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "מסכת רשת"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "שער גישה"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "מטרית"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "קידומת"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "עריכת %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "עריכת חיבור ללא שם"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_שם החיבור:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "שגיאה באתחול העורך"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "הוספת החיבור נכשלה"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "עורך החיבורים לא הצליח למצוא כמה משאבים נחוצים (קובץ ה־‎.ui לא נמצא)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_שמירה"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "שמירת שינויים כלשהם שנערכו לחיבור זה."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "יש צורך באימות כדי לשמור את החיבור לכל המשתמשים במחשב."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "לא ניתן ליצור את החיבור"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "לא ניתן לערוך את החיבור"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "אירעה שגיאה בלתי ידועה בעת יצירת חלון עריכת החיבורים."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "שגיאה באתחול העורך"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "הוספת החיבור נכשלה"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3012,50 +3373,51 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_שם החיבור:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "י_צוא..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "תווית"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "תווית"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "אף פעם"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "כעת"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3063,7 +3425,7 @@ msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 msgstr[2] "לפני שתי דקות"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3071,7 +3433,7 @@ msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 msgstr[2] "לפני שעתיים"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3079,7 +3441,7 @@ msgstr[0] "לפני יום"
 msgstr[1] "לפני %d ימים"
 msgstr[2] "לפני יומיים"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3087,7 +3449,7 @@ msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 msgstr[2] "לפני חודשיים"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3095,123 +3457,168 @@ msgstr[0] "לפני שנה"
 msgstr[1] "לפני %d שנים"
 msgstr[2] "לפני שנתיים"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "הוספת החיבור נכשלה"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "חיבור DSL %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "חיבור DSL %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "שם"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "שימוש אחרון"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "עריכת החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "נדרש אימות כדי לערוך את החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "מחיקת החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "נדרש אימות כדי למחוק את החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "סוג חיבור פס הנייד הרחב לא נתמך."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "לא ידוע כיצד ליצור חיבורים מסוג '%s'"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "שגיאה בעריכת החיבור"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "שגיאה ביצירת החיבור"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "הוספת החיבור נכשלה"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "לא הותקנו תוספי VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "לא ידוע כיצד ליצור חיבורים מסוג '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "שגיאה בעריכת החיבור"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "לא נמצא חיבור עם המזהה הייחודי '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "חיבורי רשת"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_חיבורי VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "אבטחת 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של אבטחת 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "שימוש באבטחת _‎8021.X עבור חיבור זה"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "לא ניתן למצוא התקן Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "חיבור מאוגד %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "רשת קווית"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "רשת אלחוטית"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש למאגד."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "כתובת DNS ראשית:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "חיבור מאוגד %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לגישור."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "חיבור מגושר %d"
@@ -3219,33 +3626,38 @@ msgstr "חיבור מגושר %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "פתחת הגשר"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של פתחת הגישור."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "מ_נשק ההורה:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "חיבור DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3255,44 +3667,43 @@ msgstr ""
 "אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה "
 "להלן.  לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "בהתעלמות"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת קווית."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "רשת קווית"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "כתובת ה־MAC המ_שוכפלת:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "חיבור קווי %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "בררת מחדל"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3302,11 +3713,11 @@ msgstr ""
 "באזור זה תוביל לשימוש באזור בררת המחדל בחומת האש. יש להשתמש בזה רק אם חומת "
 "האש פעילה."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש הכללי."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3317,183 +3728,187 @@ msgstr ""
 "אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה "
 "להלן.  לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "חיבור InfiniBand‏ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "חיבור קווי %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "אוטומטי (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "כתובות אוטומטיות (VPN) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "אוטומטי כתובות בלבד"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "אוטומטי (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "כתובות אוטומטיות (PPPoE) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "אוטומטי (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "כתובות אוטומטיות (DHCP) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "קישוריות מקומית בלבד"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "שרתי _DNS נוספים:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "מתחמי _חיפוש נוספים:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "עריכת נתיבי IPv4 עבור %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "הגדרות IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "אוטומטי, DHCP בלבד"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "עריכת נתיבי IPv6 עבור %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "הגדרות IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "לא ניתן לטעון את מנשק המשתמש לרשת WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "חיבור WiMAX‏ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s מחפה על %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת פס רחב אלחוטית."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "סוג חיבור פס הנייד הרחב לא נתמך."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "בחירת סוג הפס הרחב הנייד"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3502,91 +3917,87 @@ msgstr ""
 "נא לבחור את הטכנולוגיה בה משתמש ספק הפס הרחב הנייד שלך. במידה של חוסר ודאות, "
 "נא לשאול את הספק שלך."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "הספק שלי משתמש בטכנולוגיה המבוססת על _GSM ‏(לדוגמה GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "הספק שלי משתמש בטכנולוגיה המבוססת על _CDMA ‏(לדוגמה 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ללא"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "עריכת שיטות אימות PPP עבור %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "הגדרות PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש למאגד."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־vlan."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "חיבור DSL %d"
@@ -3594,12 +4005,12 @@ msgstr "חיבור DSL %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "פתחת הגשר"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של פתחת הגישור."
@@ -3607,58 +4018,58 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "אין חיבור רשת"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "חיבור VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "לא ניתן לטעון את מנשק המשתמש ל־VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "לא ניתן למצוא שירות תוסף VPN עבור '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "לא ניתן למצוא שירות תוסף VPN עבור '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ההתקשרות נכשלה"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "לא ניתן לטעון את מנשק המשתמש ל־VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "לא ניתן למצוא שירות תוסף VPN עבור '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "חיבור VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "נא לבחור את סוג חיבור ה־VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3669,7 +4080,7 @@ msgstr ""
 "חיבור ה־VPN שברצונך ליצור אינו מופיע ברשימה, יתכן שלא מותקן אצלך תוסף ה־VPN "
 "המתאים."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3678,7 +4089,7 @@ msgstr ""
 "אפשרות זהו נועלת חיבור זה לנקודה הגישה האלחוטית (AP) שצוינה על ידי ה־BSSID "
 "שצוין כאן. לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3688,96 +4099,94 @@ msgstr ""
 "אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה "
 "להלן.  לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u מה״ץ)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת אלחוטית."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "התקן כלשהו"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "חיבור אלחוטי %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "מפתח WEP בן ‎40/128-bit (הקסדצימלי או ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ססמת WEP ‏bit-‏128"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "‏WEP דינאמי (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA & WPA2 אישי"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA & WPA2 עסקי"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "לא ניתן לטעון את מנשק המשתמש של אבטחת הרשת האלחוטית; חסרה הגדרה לרשת "
 "האלחוטית."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "אבטחת רשת אלחוטית"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של אבטחת הרשת האלחוטית."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "קובץ בשם \"%s\" כבר קיים."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ה_חלפה"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "האם ברצונך להחליף את %s בחיבור ה־VPN שנשמר כעת?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "לא ניתן לייצא חיבור VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3788,476 +4197,459 @@ msgstr ""
 "\n"
 "שגיאה: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "יצוא חיבור VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_שחרור"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "שחרור מכשיר זה אוטומטית"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "פרטי החיבור"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "חיבורי חשת פעילים"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "בחירת אישור CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_מפתח פרטי:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ססמת מפתח _פרטי:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "בחירת אישור CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "אישור _משתמש:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "חיבור הפס הנייד הרחב שלך הוגדר עם האפשרויות הבאות:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ההתקן שלך:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "הספק שלך:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "התכנית שלך:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"כעת ייווצר חיבור אל ספק פס־רחב הנייד לפי ההגדרות שבחרת. אם החיבור נכשל או "
-"שאין גישה למשאבי רשת, נא לבדוק את ההגדרות שבחרת. כדי לשנות את הגדרות הפס־רחב "
-"הנייד, יש לבחור ב\"חיבורי רשת\" דרך התפריט מערכת >> העדפות."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "אישור הגדרות פס רחב נייד"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "המדינה שלי לא מופיעה"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "לא רשום"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_בחירת התכנית שלך:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "ה־APN (שם נקודת הגישה) של התכנית ה_נבחרת:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"אזהרה: בחירה בתכנית שגויה עלולה ליצור בעיות חיוב בחשבון הפס־רחב או למנוע "
-"התחברות.\n"
-"\n"
-"במקרה של חוסר ודאות בנוגע לתכנית, נא לפנות אל הספק לפרטים."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "בחירת תכנית החיוב"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "התכנית שלי לא מופיעה..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "בחירת הספק שלך מ_רשימה:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ספק"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ספק:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "הספק שלי משתמש בטכנולוגיית GSM ‏(GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "הספק שלי משתמש בטכנולוגיית CDMA ‏(1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "בחירת הספק שלך"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "מדינה או רשימת אזורים:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "מדינה או אזור"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "המדינה שלי לא מופיעה"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "נא לבחור את המדינה או האזור של הספק שלך"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "התקן GSM מותקן"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "התקן CDMA מותקן"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "התקן כלשהו"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "חיבור פס רחב נייד חדש"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "אשף זה עוזר בהגדרה פשוטה חיבור פס נייד רחב לרשת סלולרית (דור שלישי)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "המידע הבא יהיה דרוש לך:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "שם ספק רוחב הפס שלך"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "שם תכנית החיוב שלך"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(בחלק מהמקרים) שם נקודת הגישה (Access Point Name) של תכנית החיוב שלך"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "יצירת חיבור עבור התקן הפס הרחב הנייד ה_זה:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "התקן כלשהו"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "הגדרת חיבור פס רחב נייד"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "חיבור פס רחב נייד חדש"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "מדינה או אזור"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "נא לבחור את המדינה או האזור של הספק שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "בחירת הספק שלך מ_רשימה:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "הספק שלי משתמש בטכנולוגיית GSM ‏(GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "הספק שלי משתמש בטכנולוגיית CDMA ‏(1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "בחירת הספק שלך"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_בחירת התכנית שלך:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ה־APN (שם נקודת הגישה) של התכנית ה_נבחרת:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"אזהרה: בחירה בתכנית שגויה עלולה ליצור בעיות חיוב בחשבון הפס־רחב או למנוע "
+"התחברות.\n"
+"\n"
+"במקרה של חוסר ודאות בנוגע לתכנית, נא לפנות אל הספק לפרטים."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "בחירת תכנית החיוב"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "חיבור הפס הנייד הרחב שלך הוגדר עם האפשרויות הבאות:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ההתקן שלך:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "הספק שלך:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "התכנית שלך:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"כעת ייווצר חיבור אל ספק פס־רחב הנייד לפי ההגדרות שבחרת. אם החיבור נכשל או "
+"שאין גישה למשאבי רשת, נא לבדוק את ההגדרות שבחרת. כדי לשנות את הגדרות הפס־רחב "
+"הנייד, יש לבחור ב\"חיבורי רשת\" דרך התפריט מערכת >> העדפות."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "אישור הגדרות פס רחב נייד"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(אין)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "אישור C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "לא ידוע"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "בחר קובץ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "בחר קובץ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "בחירת אישור CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "אישור _משתמש:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "שגיאה בעריכת החיבור"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_שחרור"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_בקשת ססמה זו בכול פעם"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "נדרשת ססמה כדי להתחבר ל־'%s'."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "ססמה מ_שנית:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "הצ_גת ססמאות"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ססמה מ_שנית:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "הצ_גת ססמאות"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ססמה מ_שנית:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_ססמה:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "הנתקות"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "אין"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "‏WEP דינאמי (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "י_צירה"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "נדרשים ססמאות או מפתחות הצפנה כדי לגשת לרשת האלחוטית '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "נדרש אימות לרשת האלחוטית"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "הרשת האלחוטית דורשת אימות"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "יצירת רשת אלחוטית חדשה"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "רשת אלחוטית חדשה"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "נא להזין את שם הרשת האלחוטית שברצונך ליצור."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "התחברות לרשת אלחוטית סמויה"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "רשת אלחוטית סמויה"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר אליה."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "אבטחת רשת אל_חוטית:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "חי_בור:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "מ_תאם רשת אלחוטית:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "אין באפשרותי למצוא את הספק שלי וברצוני להזין אותו _ידנית:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ספק:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "מדינה או רשימת אזורים:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "מדינה או אזור"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "קווי"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "רישות OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4267,17 +4659,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "אבטחת רשת אל_חוטית:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "שם ה_רשת:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "חי_בור:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "מ_תאם רשת אלחוטית:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ניצול:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4285,7 +4699,7 @@ msgstr ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4293,412 +4707,466 @@ msgstr ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "לא פעיל"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "לא רשום"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "רשת ביתית (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "רשת ביתית"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "חיפוש"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "הרישום נדחה"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s‏ (%s בנדידה)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (בנדידה)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "רשת נדידה (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "רשת נדידה"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "קוד PIN עבור כרטיס ה־SIM‏ '%s' שב־ '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "נדרש קוד PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "נדרש קוד PIN עבור התקן הפס הרחב הנייד"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "חיבור הפס הרחב הנייד '%s' פעיל: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "נדידה"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "חיבור %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "אישורי DER או PEM ‏(‎*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "‏DER, ‏PEM או מפתחות פרטיים מסוג PKCS#12 ‏(‎*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "נא לבחור בקובץ PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "קובצי PAC‏ (‎*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "כל הקבצים"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "אלמוני"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "מאומת"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "שניהם"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "זהות א_למונית:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_קובץ PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "אימות _פנימי:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_מתן האפשרות לבדיקת PAC אוטומטית"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "בחירת אישור של רשות אישורים..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "גרסה 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "גרסה 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "אישור C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_גרסת PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "ססמת WEP ‏bit-‏128"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "הצ_גת ססמאות"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "לא _נדרש אישור של רשות אישורים"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "לא _נדרש אישור של רשות אישורים"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ז_הות:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "מהיר"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "‏TLS ממונהר"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP מוגן (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_אימות:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (בררת מחדל)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "מערכת פתוחה"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "מפתח משותף"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (בררת מחדל)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_מפתח:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "הצ_גת מפתח"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_אינדקס WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_סוג:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (בררת מחדל)"
+
+#~ msgid "Ignored"
+#~ msgstr "בהתעלמות"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "אירע כשל בעדכון סודות החיבור עקב שגיאה בלתי ידועה."
+
+#~ msgid "Priority:"
+#~ msgstr "עדיפות:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "יש להתחבר לרשת זו אוטומטית כאשר היא _זמינה"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_פרטי החיבור"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "לא ניתן לייבא חיבור VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "הקובץ '%s לא ניתן לקריאה כיוון שהוא לא מכיל נתוני חיבור VPN מזוהים\n"
+#~ "\n"
+#~ "שגיאה: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "שגיאה בלתי מוכרת"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "בחירת אישור של רשות אישורים..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "אישור C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "מנהל הרשתות"
@@ -4732,15 +5200,6 @@ msgstr "_סוג:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "משא ומתן _אוטומטי"
 
@@ -4932,15 +5391,6 @@ msgstr "_סוג:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "כתובת DNS ראשית:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "כתובת DNS משנית:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS שלישי:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "כתובת ה־_MAC של ההתקן:"
 
@@ -4996,12 +5446,6 @@ msgstr "_סוג:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "כתובות אוטומטיות (PPP) בלבד"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "לא ניתן לטעון את מנשק המשתמש לרשת WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "חיבור WiMAX‏ %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5021,9 +5465,6 @@ msgstr "_סוג:"
 #~ msgid "Error: %s"
 #~ msgstr "שגיאה: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "אירע כשל ביצירת חיבור בהתקשרות: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "הטלפון שלך מוכן כעת לשימוש!"
 
@@ -5074,21 +5515,12 @@ msgstr "_סוג:"
 #~ "אי שימוש באישור של רשות אישורים (CA) יכולה לגרום להתחברות לרשתות אלחוטיות "
 #~ "בלתי מאובטחות וזדוניות. האם ברצונך לבחור אישור של רשות אישורים?"
 
-#~ msgid "Yes"
-#~ msgstr "כן"
-
 #~ msgid "Only on activation"
 #~ msgstr "רק עם ההפעלה"
 
-#~ msgid "No"
-#~ msgstr "לא"
-
 #~ msgid "Carrier de_tect:"
 #~ msgstr "זיהוי ס_פק:"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "התחברות אוטו_מטית"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "זמין לכל המשתמשים"
 
@@ -5131,9 +5563,6 @@ msgstr "_סוג:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "חיבור אלחוטי %d"
 
-#~ msgid "_Import"
-#~ msgstr "י_בוא"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "אירעה שגיאה בלתי ידועה."
 
@@ -5292,22 +5721,6 @@ msgstr "_סוג:"
 #~ msgid "Country"
 #~ msgstr "מדינה"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "מארק קרפיבנר <mark125@gmail.com>\n"
-#~ "Yaron Shahrabani <sh.yaron@gmail.com>\n"
-#~ "\n"
-#~ "פרויקט תרגום GNOME לעברית:\n"
-#~ "‏http://gnome-il.berlios.de\n"
-#~ "\n"
-#~ "Launchpad Contributions:\n"
-#~ "  Ddorda https://launchpad.net/~ddorda\n"
-#~ "  Michael Gefen https://launchpad.net/~gefenm11\n"
-#~ "  Shlomil https://launchpad.net/~shlomister\n"
-#~ "  Yaron https://launchpad.net/~sh-yaron\n"
-#~ "  itai_lahat https://launchpad.net/~itailahat\n"
-#~ "  kulight https://launchpad.net/~kulight"
-
 #~ msgid "PUK code required"
 #~ msgstr "נדרש קוד PUK"
 
diff --git a/po/hi.po b/po/hi.po
index bf77e212..18fa1b86 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,8 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-03-24 13:57+0000\n"
 "Last-Translator: chandankumar <chandankumar.093047@gmail.com>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
@@ -28,98 +29,108 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "संजाल"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "अपना संजाल कनेक्शन नियंत्रित करें"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "संजाल कनेक्शन"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "सक्रिय संजाल कनेक्शन"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "अपना संजाल कनेक्शन सेटिंग प्रबंधित करें और बदलें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "कनेक्शन सूचना निष्क्रिय करें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "इसे सही पर सेट करें सूचना निष्क्रिय करने के लिए जब संजाल से कनेक्ट कर रहा हो. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "डिसकनेक्टेज सूचना निष्क्रिय करें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "सूचना निष्क्रिय करने के लिए इसे सही पर सेट करें जब संजाल से डिसकनेक्ट कर रहा हो. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr " VPN सूचना निष्क्रिय करें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "इसे सही पर सेट सूचनाओं जब जोड़ने या एक वीपीएन से डिस्कनेक्ट को निष्क्रिय."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "संडाल उपलब्ध अधिसूचना दबाएँ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "सही पर सेट करने के लिए सूचनाओं को अक्षम जब वाईफाई नेटवर्क उपलब्ध हैं."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "स्टैम्प"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "निर्धारित करने के लिए प्रयुक्त कि क्या सेटिंग को नए संस्करण में उत्प्रवासित करना चाहिए."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi निर्माण निष्क्रिय करें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "तदर्थ नेटवर्क के निर्माण को निष्क्रिय करने के लिए जब एप्लेट का उपयोग सही पर सेट करें."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA प्रमाणपत्र पर ध्यान न दें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 "इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम करने के."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -127,130 +138,143 @@ msgstr ""
 "सही पर सेट करें EAP प्रमाणीकरण के चरण 2 में CA प्रमाणपत्र के बारे में चेतावनी को निष्क्रिय "
 "करने के लिए."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "नेटवर्क मैनेजर"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "कोई संजाल संबंधन नहीं"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "नेटवर्कप्रबंधक एप्लेट"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "कनेक्ट (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "संजाल नाम (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "तदर्थ"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "कनेक्शन को जोड़ने के लिए / सक्रिय करने में विफल"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "अज्ञात त्रुटि"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "कनेक्शन असफल"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "डिवाइस डिस्कनेक्ट करने में विफल रहा"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "डिस्कनेक्ट विफलता"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "कनेक्शन सक्रिय किया जाना विफ"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "इस संदेश को फिर मत दिखाएँ"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' टूट गया क्योंकि संजाल कनेक्शन में बाधा आई."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -270,7 +294,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि संजाल कनेक्शन में बाधा आई थी."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा अप्रत्याशित रूप से रूक गया."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -289,7 +313,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा ने इसे अवैध विन्यास वापस दिया."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि कनेक्शन प्रयास का समय समाप्त हो गया."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा समय पर शुरू नहीं हो पाई."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -316,7 +340,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा आरंभ होने में विफल रही."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि कोई वैध VPN गुप्त नहीं था."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि अवैध VPN गुप्तता थी."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -354,19 +378,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN कनेक्शन को सफलतापूर्वक स्थापित किया गया है.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN लॉगिन संदेश"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN कनेक्शन असफल"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -378,7 +402,7 @@ msgstr ""
 "VPN कनेक्शन '%s' विफल रहा VPN सेवा आरंभ होने में विफल रही.\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,561 +415,586 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "युक्तियां तैयार नहीं (फर्मवेयर गुम)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "युक्तियां तैयार नहीं"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "डिसकनेक्टेड"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "डिस्कनेक्ट"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "युक्तियां प्रबंधित नहीं"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "कोई संजाल युक्तियां उपलब्ध नहीं"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN कनेक्शन"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN विन्यस्त करें (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN कनेक्शन"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "नेटवर्कप्रबंधक कार्यशील नहीं है..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "संजालन निष्क्रिय"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "संजालन सक्रिय करें (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "बेतार सक्रिय करें (_W) "
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबैंड सक्रिय करें (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "सूचना सक्रिय करें (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "कनेक्शन जानकारी (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "कनेक्शन्स संपादित करें..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "के बारे में (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "आप अब '%s' को कनेक्टेड हैं."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "डिस्कनेक्टेड"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "संजाल संबंधन को डिसकनेक्ट किया गया है."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "संजाल संबंधन '%s' तैयार किया जा रहा है..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "उपयोक्ता सत्यापन संजाल संबंधन '%s' के लिए जरूरी है..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' के लिए संजाल पता आग्रह कर रहा है..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "संजाल कनेक्शन '%s' सक्रिय है"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN कनेक्शन '%s' आरंभ कर रहा है..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "उपयोक्ता सत्यापन VPN संबंधन '%s' के लिए जरूरी है..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "कोई VPN पता को '%s' के लिए आग्रह कर रहा है..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN कनेक्शन '%s' सक्रिय है"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "कोई संजाल संबंधन नहीं"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "नेटवर्कप्रबंधक एप्लेट"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "गलत PUK कोड; कृपया अपने प्रदाता से संपर्क करें."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "गलत PIN कोड; कृपया अपने प्रदाता से संपर्क करें."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "अनलॉक कोड भेज रहा है..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "मोबाइल ब्रॉडबैंड (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबैंड"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "उपलब्ध"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "कनेक्शन स्थापित"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "आप अभी मोबाइव ब्रॉडबैंड संजाल से कनेक्टेड हैं."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "मोबाइल ब्रॉडबैंज संजाल."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "अब आप घर संजाल पर पंजीकृत हैं."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "अब आप एक रोमिंग संजाल पर पंजीकृत हैं."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "आप अभी मोबाइव ब्रॉडबैंड संजाल से कनेक्टेड हैं."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' तैयार कर रहा है..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' विन्यस्त कर रहा है..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' के लिए उपयोक्ता सत्यापन जरूरी...."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' सक्रिय"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "स्वतः इथरनेट"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "इथरनेट संजाल (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "इथरनेट संजाल (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "इथरनेट संजाल"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "इथरनेट संजाल"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "आप अभी वायर युक्त संजाल से कनेक्टेड हैं."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "वायर युक्त संजाल '%s' के लिए तैयार कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "वायर युक्त कनेक्शन '%s' विन्यस्त कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr " उपयोक्ता सत्यापन वायर युक्त कनेक्शन '%s' के लिए जरूरी है..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' के लिए वायर युक्त संजाल पता आग्रह कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "वायरयुक्त संजाल कनेक्शन '%s' सक्रिय "
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL सत्यापन"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "नया वाई फाई नेटवर्क बनाएँ"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(कोई नहीं)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "नए कनेक्शन जोड़ने में विफल"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "वाई फाई  संजाल (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr " वाई फाई  संजाल (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] " वाई फाई  संजाल"
 msgstr[1] " वाई फाई  संजाल"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr " वाई फाई अक्षम किया है"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr " वाई फाई हार्डवेयर स्विच से अक्षम है"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "अधिक संजाल"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr " वाई फाई  संजाल उपलब्ध"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr " वाई फाई संजाल से कनेक्ट करने के लिए संजाल मेनू का उपयोग करें"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "आप अभी  वाई फाई संजाल '%s' में कनेक्टेड हैं."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr " वाई फाई संजाल संबंधन '%s' तैयार किया जा रहा है..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr " वाई फाई  कनेक्शन '%s' विन्यस्त कर रहा है..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "उपयोक्ता सत्यापन जरूरी है  वाई फाई संजाल '%s' के लिए..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' के लिए वाई फाई संजाल पता आग्रह कर रहा है..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr " वाई फाई संजाल संबंधन '%s' सक्रिय: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr " वाई फाई संजाल कनेक्शन '%s' सक्रिय"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "कनेक्शन को सक्रिय करने में विफल"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "कनेक्शन संबंधन दिखाने में त्रुटि:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "गतिशील WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "पते"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "कुछ नहीं"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s डिफ़ॉल्ट"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "अज्ञात"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP पताः"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ब्रॉडकास्ट पता"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "सबनेट मास्क"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "प्राथमिक DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "द्वितीयक DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "त्रिगुट DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "इथरनेट (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "सामान्य"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "इंटरफेसः"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "हार्डवेयर पता"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ड्राइवर"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "गतिः"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "सुरक्षा:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "डिफ़ॉल्ट रूट"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "नज़रअंदाज़ किया"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "पासवर्ड: "
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN क़िस्म"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN गेटवे"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPNप्रयोक्ता नाम"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN ध्वज"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "आधार कनेक्शन"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "अज्ञात"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "कोई वैध सक्रिय कनेक्शन नहीं पाया गया!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -953,48 +1002,52 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "और कई अन्य समुदाय के योगदान और अनुवादकों"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "आपके संजाल युक्तियां और कनेक्शन को प्रबंधित करने के लिए अधिसूचना क्षेत्र एप्लेट."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "नेटवर्क प्रबंधक वेबसाइट"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "राजेश रंजन (rranjan@redhat.com, rajeshkajha@yahoo.com)"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "नेटवर्कप्रबंधक एप्लेट कुछ जरूरी संसाधनों ( .ui फाइल नहीं मिलता था) को नहीं ढूँढ़ सका."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "अनुपस्थित संसाधन"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "मोबाइल ब्रॉडबैंज संजाल कूटशब्द"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "एक कूटशब्द '%s' में कनेक्ट होने के लिए जरूरी है."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "पासवर्ड: "
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN अनलॉक जरूरी"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN अनलॉक जरूरी"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1057,25 @@ msgstr ""
 "जाए."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "पिन कोड:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "पिन कोड दिखायें"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK अनलॉक जरूरी"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK अनलॉक जरूरी"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1032,35 +1085,42 @@ msgstr ""
 "जा सके."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "पीयूके कोड:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "नया पिन कोड:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "नया पिन कोड फिर दाखिल करें:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "कनेक्शन जानकारी"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN कनेक्शन बनाने में विफल: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1069,41 +1129,41 @@ msgstr ""
 "IP पता आपके कंप्यूटर को संजाल पर पहचानता है.  \"जोड़ें\" बटन को किसी IP पता जोड़ने के "
 "लिए क्लिक करें."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "मिटाएँ (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "स्वतः प्राप्त रूट अनदेखा करें (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "इस कनेक्शन का उपयोग करें इसके संजाल पर संसाधन के लिए (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1111,16 +1171,16 @@ msgstr ""
 "यदि सक्रिय किया गया है, यह कनेक्शन को तयशुदा संजाल कनेक्शन के लिए कभी प्रयोग नहीं किया "
 "जाएगा."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "बनाएँ..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "कनेक्शन प्रकार चुनें"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1132,85 +1192,100 @@ msgstr ""
 "यदि VPN कनेक्शन के प्रकार आप बनाना चाहते हैं सूची में प्रकट नहीं होता है, तो आप सही "
 "वीपीएन प्लगइन अधिष्ठापित नहीं हो सकता है."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "सेवा (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "राउण्ड रॉबिन"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "सक्रिय बैकअप"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "एक्सओआर"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ब्रॉडकास्ट"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "अनुकूली संचारित लोड संतुलन"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "अनुकूली लोड संतुलन"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (अनुशंसित)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "बंधित कनेक्शन: (_c)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "विधि (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "आवृत्ति मॉनिटरिंग: (_f)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "मि.से."
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "इंटरफेस नाम: (_I)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "कड़ी निगरानी: (_L)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP लक्ष्य: (_t)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1218,124 +1293,184 @@ msgstr ""
 "एक आईपी पता, या आईपी पतों की एक कॉमा सेपरेटेड सूची है, जब लिंक की स्थिति की जाँच करने "
 "के लिए देखने के लिए."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "देरी लिंक: (_u)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "देरी डाउन लिंक: (_d)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "प्राथमिक DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "बाइट्स"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "पथ  लागत (_c):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Hairpin मोड: (_H)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "आधार कनेक्शन: (_c)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "अग्रेषित देरी: (_F)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "हैलो समय: (_H)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "संजालन सक्रिय करें (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "सक्रिय करें एसटीपी (स्पैनिंग ट्री प्रोटोकॉल) (_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "अधिकतम उम्र: (_M)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "उम्र बढ़ने समय: (_A)"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "स्वचालित"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "डिफ़ॉल्ट"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "बेतार सक्रिय करें (_W) "
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1346,441 +1481,536 @@ msgstr ""
 "प्रयोग किया जाएगा जिसपर यह सक्रिय है.  इस विशेषता को बतौर MAC क्लोनिंग या स्पूफिंग "
 "जाना जाता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "पता"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "पता"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN अंतरफलक नाम: (_n)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "हार्डवेयर पता:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "कोई युक्तियां"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "कनेक्शन गुप्तता को अद्यतन करने में विफल किसी अज्ञात त्रुटि के कारण."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "802.1X सुरक्षा का इस कनेक्शन के लिए उपयोग करें"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "बेतार सक्रिय करें (_W) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "प्राथमिकता: (_P)"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "प्रयोक्ता नाम (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "सेवा (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "कूटशब्द (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "इंटरफेसः"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "पैरेंट इंटरफ़ेस: (_P)"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "पैरेंट इंटरफ़ेस: (_P)"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "स्वचालित"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "मुड़ जोड़ी (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "संलग्न एकक अंतराफलन (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "मीडिया स्वतंत्र अंतरफलक (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 गीबा/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "नज़रअंदाज़ करें"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "हस्तचालित"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "पोर्ट (_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "सेवा (_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "क्लोन किया MAC पता:  (_l)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "डिफ़ॉल्ट"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "नज़रअंदाज़ करें"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ब्रॉडकास्ट"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "गति (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "पूर्ण डुप्लेक्स (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "स्वचालित रूप से VPN से कनेक्ट जब इस संबंध का उपयोग (_V)"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "कुछ नहीं"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "सभी उपयोगकर्ताओं को इस नेटवर्क से जुड़ सकते हैं (_u)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "स्वचालित रूप से इस नेटवर्क से कनेक्ट जब यह उपलब्ध है (_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "स्वचालित रूप से VPN से कनेक्ट जब इस संबंध का उपयोग (_V)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "कनेक्शन जानकारी (_I)"
+msgid "Firewall _zone"
+msgstr "फायरवॉल ज़ोन: (_z)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "बंधित कनेक्शन: (_c)"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "स्वतः कनेक्ट करें (_a)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "फायरवॉल ज़ोन: (_z)"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1789,7 +2019,7 @@ msgstr ""
 "IP पता आपके कंप्यूटर को संजाल पर पहचानता है.  \"जोड़ें\" बटन को किसी IP पता जोड़ने के "
 "लिए क्लिक करें."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1797,128 +2027,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "स्वचालित, पता केवल"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "पते"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "परिवहन मोड: (_T)"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "आंकड़ारेख"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "जुड़ा हुआ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "परिवहन मोड: (_T)"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "युक्ति नाम + संख्या"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "इथरनेट"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "विधि (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "स्वत: मैनुअल डीएनएस सेटिंग्स के साथ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "लिंक स्थानीय"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "दूसरे कंप्यूटर में साझेदारी"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "विधि (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1928,8 +2162,8 @@ msgstr ""
 "DHCP क्लाइंट पहचानकर्ता आपके कंप्यूटर के विन्यास को पसंदीदा बनाने की अनुमति देता है.  यदि "
 "आप किसी DHCP क्लाइंट पहचानकर्ता का उपयोग करना चाहते हैं, इसे दाखिल करें."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1937,25 +2171,26 @@ msgstr ""
 "मेजबान नाम के हल करने के दौरान प्रयुक्त डोमेन नाम. विविध डोमेन अलग करने के लिए "
 "अर्द्धविराम का उपयोग करें."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP क्लाइंट आईडी (_H):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "डोमेन खोजें : (_S)"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "डीएनएस सर्वर (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1963,11 +2198,11 @@ msgstr ""
 "मेजबान नाम हल करने के लिए डोमेन नाम सर्वर का IP पता. विविध डोमेन नाम सर्वर पताओं को "
 "अलग करने के लिए विराम चिह्न का प्रयोग करें."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "इस कनेक्शन के पूरा होने के लिए IPv_4 पता चाहिए"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1975,25 +2210,35 @@ msgstr ""
 "जब IPv6-सक्षम संजाल से कनेक्ट किया जाता है, कनेक्शन को पूरा होने के लिए अनुमति देता है यदि "
 "IPv6 विन्यास विफल रहता है लेकिन IPv6 विन्यास आमने आता है."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "मार्गों ... (_R)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "निष्क्रिय"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "बेतार सक्रिय करें (_W) "
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2003,15 +2248,19 @@ msgstr ""
 "मेजबान नाम हल करने के लिए डोमेन नाम सर्वर का IP पता. विविध डोमेन नाम सर्वर पताओं को "
 "अलग करने के लिए विराम चिह्न का प्रयोग करें."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "इस कनेक्शन के पूरा होने के लिए IPv_6 पता चाहिए"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2019,755 +2268,861 @@ msgstr ""
 "जब IPv4-सक्षम संजाल से कनेक्ट जाता है, कनेक्शन को पूरा होने के लिए अनुमति देता है यदि IPv6 "
 "विन्यास विफल रहता है लेकिन IPv4 विन्यास आमने आता है."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "मेट्रिक"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "आयात करें (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "मूल"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "संख्या (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "विस्तृत"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "संजाल ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "बदलें..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "पिन: (_I)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "रोमिंग स्वीकारें यदि घर संजाल उपलब्ध नहीं है (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "सत्यापन"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "अनुमतिप्राप्त विधि:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "विधियाँ विन्यस्त करें (_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "संकुचन"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "बिंदु से बिंदु तक गोपन का उपयोग करें (MPPE) (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-बिट गोपन जरूरी (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "स्टेटफुल MPPE का उपयोग करें (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD आँकड़ा संकुचन स्वीकारें"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "विस्तारित आँकड़ा संकुचन स्वीकारें (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP शीर्षिका संकुचन का उपयोग करें (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "इको"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP इको पैकेट भेजें (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "विधि (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "कुछ नहीं"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "विधि (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "विस्तृत"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "इथरनेट संजाल"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "प्राथमिकता: (_P)"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "निजी कुंजी (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "देरी लिंक: (_u)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "देरी डाउन लिंक: (_d)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "पैरेंट इंटरफ़ेस: (_P)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP लक्ष्य: (_t)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP लक्ष्य: (_t)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "इथरनेट"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "बंधित कनेक्शन: (_c)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "इथरनेट"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "हार्डवेयर पता:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "हार्डवेयर पता:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "प्राथमिकता: (_P)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "प्रेषण शक्ति(_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "प्रेषण शक्ति(_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "पैरेंट इंटरफ़ेस: (_P)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN अंतरफलक नाम: (_n)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "क्लोन MAC पता (_C): "
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN आईडी: (_i)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "युक्ति नाम + संख्या"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + संख्या"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "सुरक्षा: (_e)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "बी/जी (2.4 गीगा)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "तदर्थ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "प्रेषण शक्ति(_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "दरः (_R)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "चैनल (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "स्वीकृत सत्यापन विधि"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "विस्तारयोग्य प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "पासवर्ड प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल संस्करण 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2776,241 +3131,233 @@ msgstr ""
 "अधिकतर स्थितियों में, प्रदाता PPP सर्वर सभी सत्यापन विधियों का समर्थन करेगा.  यदि "
 "कनेक्शन विफल रहता है, कुछ विधियों के लिए समर्थन निष्क्रिय करने की कोशिश करें."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "वाई फाई"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "ब्लूटूथ"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "बंधन"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "पुल"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN प्लगिन VPN कनेक्शन को सही तरीके से आयात करने में विफल रहा\n"
-"\n"
-"त्रुटि: कोई VPN सेवा प्रकार नहीं."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN कनेक्शन आय़ात नहीं कर सका"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"फाइल '%s' पढ़ा नहीं जा सका अथवा कोई परिचित VPN कनेक्शन सूचना को समाहित नहीं कर "
-"सका\n"
+"VPN प्लगिन VPN कनेक्शन को सही तरीके से आयात करने में विफल रहा\n"
 "\n"
-"त्रुटि: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "अज्ञात त्रुटि"
+"त्रुटि: कोई VPN सेवा प्रकार नहीं."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "आयात के लिए फाइल चुनें"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "आभासी"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "कनेक्शन संपादक संवाद आरंभ नहीं किया जा सका किसी अज्ञात त्रुटि के कारण."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "नया कनेक्शन नहीं बना सका"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "कनेक्शन मिटाना असफल"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "क्या आप निश्चित हैं कि आप इस कनेक्शन %s को मिटाना चाहते हैं?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN कनेक्शन"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "पता"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "नेटमास्क"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "गेटवे"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "मेट्रिक"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "उपसर्ग"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "संपादन %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "बेनाम संबंधन संपादित कर रहा है"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "कनेक्शन नाम (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "संपादक आरंभीकरण में त्रुटि"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "कनेक्शन जोड़ना असफल"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "यह कनेक्शन संपादक कुछ जरूरी संसाधन को नहीं ढूँढ़ सका (.ui  फाइल नहीं मिल सका)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "सहेजें (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "इस कनेक्शन से किए गए किसी परिवर्तनों को सहेजें"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "इस मशीन के सभी उपयोक्ता के लिए इस कनेक्शन को सहेजने के लिए सत्यापित करें."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "कनेक्शन नहीं बना सका "
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "कनेक्शन संपादित नहीं कर सका"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "अज्ञात कनेक्शन संपादक संवाद बनाने में त्रुटि."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "संपादक आरंभीकरण में त्रुटि"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "कनेक्शन जोड़ना असफल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3018,201 +3365,247 @@ msgid ""
 msgstr ""
 "इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम करने के."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "कनेक्शन नाम (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "निर्यात करें (_E)... "
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "लेबल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "लेबल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "कभी नहीं"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "अभी"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d मिनट पहले"
 msgstr[1] "%d मिनट पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d घंटा पहले"
 msgstr[1] "%d घंटे पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d दिन पहले"
 msgstr[1] "%d दिनों पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d महीना पहले"
 msgstr[1] "%d महीने पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d वर्ष पहले"
 msgstr[1] "%d वर्षों पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "कनेक्शन जोड़ना असफल"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL कनेक्शन %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL कनेक्शन %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "नाम"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "अंतिम प्रयुक्त"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "चयनित संबंधन संपादित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "चयनित संबंधन संपादित करने के लिए सत्यापित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "चयनित संबंधन मिटाएँ"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "चयनित संबंधन मिटाने के लिए सत्यापित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "असमर्थित मोबाइल ब्रॉडबैंड कनेक्शन प्रकार."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "पता नहीं कैसे '%s' कनेक्शन बनायेगा"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "त्रुटि संपादन कनेक्शन"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "कनेक्शन बनाने में त्रुटि."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "कनेक्शन जोड़ना असफल"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "पता नहीं कैसे '%s' कनेक्शन बनायेगा"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "त्रुटि संपादन कनेक्शन"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' के साथ एक कनेक्शन नहीं मिल रहा"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "संजाल कनेक्शन"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN कनेक्शन"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X सुरक्षा"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr " 802.1X  सुरक्षा उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "802.1X सुरक्षा का इस कनेक्शन के लिए उपयोग करें"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ईथरनेट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ब्लूटूथ युक्ति नहीं ढूँढ़ सका"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "बॉण्ड कनेक्शन %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "ब्लूटूथ"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "इथरनेट संजाल"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr " वाई फाई  संजाल"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "बंधन उपयोगकर्ता इंटरफ़ेस लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "प्राथमिक DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "बॉण्ड कनेक्शन %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "पुल उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "पुल संबंधन %d"
@@ -3220,33 +3613,38 @@ msgstr "पुल संबंधन %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "पुल पोर्ट"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "पुल पोर्ट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL उपयोक्ता अंतरफलक नहीं लोड कर सका."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL उपयोक्ता अंतरफलक नहीं लोड कर सका."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "पैरेंट इंटरफ़ेस: (_P)"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL कनेक्शन %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3256,44 +3654,43 @@ msgstr ""
 "यह विकल्प संजाल युक्ति में स्थायी MAC पता के द्वारा निर्दिष्ट निर्दिष्ट कनेक्शन को लॉक कर "
 "देता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "नज़रअंदाज़ किया"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ईथरनेट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "इथरनेट"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "क्लोन किया MAC पता:  (_l)"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "तारयुक्त संबंधन %d "
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "डिफ़ॉल्ट"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3303,11 +3700,11 @@ msgstr ""
 "फ़ायरवॉल में निर्धारित क्षेत्र के उपयोग में परिणाम का चयन. केवल उपयोगी अगर firewalld "
 "सक्रिय है."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "सामान्य उपयोगकर्ता इंटरफ़ेस लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3318,183 +3715,187 @@ msgstr ""
 "यह विकल्प संजाल युक्ति में स्थायी MAC पता के द्वारा निर्दिष्ट निर्दिष्ट कनेक्शन को लॉक कर "
 "देता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand संबंधन %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "तारयुक्त संबंधन %d "
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "स्वचालित (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "स्वचालित (VPN) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "स्वचालित, पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "स्वचालित (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "स्वचालित (PPPoE) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "स्वचालित (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "स्वचालित (DHCP) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "लिंक स्थानीय सिर्फ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "अतिरिक्त डीएनएस सर्वर (_v):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "अतिरिक्त डोमेन खोजें : (_e)"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4 रूट को %s के संपादन कर रहा है"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 सेटिंग"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "स्वचालित, केवल DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6 रूट को %s के लिए संपादन कर रहा है"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 सेटिंग"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 उपयोक्ता अंतरफलक नहीं लोड कर सका."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX उपयोक्ता अंतरफलक लोड नहीं कर सका."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX संबंधन %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s स्लेव %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "मोबाइल ब्रॉडबैंड उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "असमर्थित मोबाइल ब्रॉडबैंड कनेक्शन प्रकार."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "मोबाइल ब्रॉडबैंड प्रदाता प्रकार चुनें"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3503,91 +3904,87 @@ msgstr ""
 "तकनीक चुनें जो आपका मोबाइल ब्रॉडबैंड प्रदाता उपयोग करता है.  यदि आप अनिश्चित हैं अपने "
 "प्रदाता को चुनें."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "मेरा प्रदाता GSM-आधारित तकनीक चुनता है (यानी. GPRS, EDGE, UMTS, HSDPA) (_G)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "मेरा प्रदाता CDMA-आधारित तकनीक चुनता है (यानी. 1xRTT, EVDO) (_D)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "जीएसएम"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "पीएपी"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "सीएचएपी"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "कुछ नहीं"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "PPP सत्यापन विधि को %s के लिए संपादित कर रहा है"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP जमावट"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP उपयोक्ता अंतरफलक को लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "बंधन उपयोगकर्ता इंटरफ़ेस लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr " vlan उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL कनेक्शन %d"
@@ -3595,12 +3992,12 @@ msgstr "DSL कनेक्शन %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "पुल पोर्ट"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "पुल पोर्ट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
@@ -3608,58 +4005,58 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "कोई संजाल संबंधन नहीं"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr " vlan उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN संबंधन %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN उपयोक्ता अंतरफलक को लोड नहीं कर सका."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "VPN प्लगिन सेवा को '%s' के लि ढूँढ़ नहीं सका."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "VPN प्लगिन सेवा को '%s' के लि ढूँढ़ नहीं सका."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "कनेक्शन असफल"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN उपयोक्ता अंतरफलक को लोड नहीं कर सका."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "VPN प्लगिन सेवा को '%s' के लि ढूँढ़ नहीं सका."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN संबंधन %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN कनेक्शन प्रकार चुनें"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3670,7 +4067,7 @@ msgstr ""
 "के प्रकार आप बनाना चाहते हैं सूची में प्रकट नहीं होता है, तो आप सही वीपीएन प्लगइन "
 "अधिष्ठापित नहीं हो सकता है."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3679,7 +4076,7 @@ msgstr ""
 "यह विकल्प  Wi-Fi एक्सेस प्वाइंट (AP) में BSSID निर्दिष्ट कनेक्शन को यहाँ दाखिल किया जाता "
 "है.  उदाहरण के लिए: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3689,94 +4086,92 @@ msgstr ""
 "यह विकल्प संजाल युक्ति में स्थायी MAC पता के द्वारा निर्दिष्ट निर्दिष्ट कनेक्शन को लॉक कर "
 "देता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "वाई - फाई उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "कोई युक्तियां"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "वाई - फाई संबंधन %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बिट कुंजी (हेक्स या ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "गतिशील WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 निजी"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एंटरप्राइज"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "वाई - फाई सुरक्षा उपयोक्ता अंतरफलक नहीं लोड कर सका; गुम वाई - फाई सेटिंग."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "वाई फाई सुरक्षा"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "वाई - फाई सुरक्षा उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" नामक फाइल पहले से मौजूद है."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "बदलें (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "क्या आप %s को VPN कनेक्शन के साथ बदलना चाहते हैं जिसे आप सहेज रहे हैं?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN कनेक्शन निर्यात नहीं कर सका"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3787,222 +4182,106 @@ msgstr ""
 "\n"
 "त्रुटि: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN संबंधन निर्यात करें..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "अनलॉक करें (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "स्वचालित रूप से यह युक्ति अनलॉक"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "कनेक्शन जानकारी"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "सक्रिय संजाल कनेक्शन"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "सीए प्रमाणपत्र चुनें"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "निजी कुंजी (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "सीए प्रमाणपत्र चुनें"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "उपयोक्ता प्रमाणपत्र (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "आपका मोबाइल ब्रॉडबैंड कनेक्शन निम्नलिखित सेटिंग के साथ विन्यस्त है:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "आपका उपकरण:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "आपका प्रदाता:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "आपकी प्लान:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-" 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."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "मेरा देश सूचीबद्ध नहीं है"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "गैर सूचीबद्ध"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "अपना प्लान चुनें (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "चुनी गई योजना (_A) (एक्सेस प्वाइंट नाम):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"चेतावनी: कोई गलत योजना को चुनना बिलिंग मुद्दा का परिणाम देगा आपके ब्रॉडबैंड खाता के लिए "
-"या कनेक्टिविटी को रोक सकता है.\n"
-"\n"
-"यदि आप अपनी योजना के बारे में अनिश्चित हैं तो कृपया अपने प्रदाता से अपनी प्लान के APN के "
-"बारे में पूछें."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "अपना बिलिंग प्लान चुनें"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "मेरा प्लान सूचीबद्ध नहीं है..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "सूची से अपना प्रदाता चुनें (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "प्रदाता"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "प्रदाता:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "मेरा प्रदाता GSM तकनीकी उपयोग करता है (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "मेरा प्रदाता CDMA तकनीकी उपयोग करता है (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "अपना प्रदाता चुनें"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "देश या क्षेत्र सूची:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "देश या क्षेत्र"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "मेरा देश सूचीबद्ध नहीं है"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "अपने प्रदाता के देश या क्षेत्र चुनें"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "संस्थापित जीएसएम युक्तियां"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "संस्थापित CDMA युक्ति"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "कोई युक्तियां"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4010,258 +4289,357 @@ msgstr ""
 "यह सहायक आपको मोबाइल ब्रॉडबैंड कनेक्शन को किसी सेल्यूलर (3G) संजाल से आसानी से सेटअप "
 "करता है."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "आपको निम्नलिखित सूचना की जरूरत होगी:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "आपके ब्रॉडबैंड प्रदाता का नाम"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "आपका ब्रॉडबैंड बिलिंग प्लान नाम"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(कुछ स्थितियों में) आपका ब्रॉडबैंड बिलिंग प्लान APN (एक्सेस प्वाइंट नाम)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "इस मोबाइल ब्रॉडबैंड युक्ति के लिए कोई कनेक्शन बनाएँ (_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "कोई युक्तियां"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन सेटअप करें"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "देश या क्षेत्र"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "अपने प्रदाता के देश या क्षेत्र चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "सूची से अपना प्रदाता चुनें (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "मेरा प्रदाता GSM तकनीकी उपयोग करता है (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "मेरा प्रदाता CDMA तकनीकी उपयोग करता है (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "अपना प्रदाता चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "अपना प्लान चुनें (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "चुनी गई योजना (_A) (एक्सेस प्वाइंट नाम):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"चेतावनी: कोई गलत योजना को चुनना बिलिंग मुद्दा का परिणाम देगा आपके ब्रॉडबैंड खाता के लिए "
+"या कनेक्टिविटी को रोक सकता है.\n"
+"\n"
+"यदि आप अपनी योजना के बारे में अनिश्चित हैं तो कृपया अपने प्रदाता से अपनी प्लान के APN के "
+"बारे में पूछें."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "अपना बिलिंग प्लान चुनें"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "आपका मोबाइल ब्रॉडबैंड कनेक्शन निम्नलिखित सेटिंग के साथ विन्यस्त है:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "आपका उपकरण:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "आपका प्रदाता:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "आपकी प्लान:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+" 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."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(कोई नहीं)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "सीए प्रमाणपत्र (_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "अज्ञात"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "सीए प्रमाणपत्र चुनें"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "उपयोक्ता प्रमाणपत्र (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "त्रुटि संपादन कनेक्शन"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "अनलॉक करें (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "इस कूटशब्द के लिए हर समय पूछें (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "एक कूटशब्द '%s' में कनेक्ट होने के लिए जरूरी है."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "कूटशब्द (_P):"
+msgid "Sh_ow passwords"
+msgstr "कूटशब्द दिखाएँ (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "कूटशब्द (_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "कूटशब्द दिखाएँ (_w)"
+msgid "_Secondary Password:"
+msgstr "कूटशब्द (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "कूटशब्द (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "डिस्कनेक्ट"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "कुछ नहीं"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिशील WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "बनाएँ (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "कूटशब्द या गोपन कुंजी वाई फाई  संजाल '%s' की पहुँच के लिए जरूरी है."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "वाई फाई नेटवर्क प्रमाणीकरण आवश्यक"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "वाई फाईसंजाल द्वारा प्रमाणीकरण जरूरी"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "नया वाई फाई नेटवर्क बनाएँ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "नया वाई फाई संजाल"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "अपने बनाए जाने वाले वाई - फाई संजाल के लिए नाम दर्ज करें."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "छुपा वाई फाई  संजाल"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट करना चाहते हैं."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "वाई फाई सुरक्षा (_s):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "कनेक्शन (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "वाई फाई एडाप्टर (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "प्रदाता:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "देश या क्षेत्र सूची:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "देश या क्षेत्र"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "तारयुक्त"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC जाल"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "पीसीआई"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "यूएसबी"
 
@@ -4271,17 +4649,39 @@ msgstr "यूएसबी"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "वाई फाई सुरक्षा (_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "संजाल नाम (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "कनेक्शन (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "वाई फाई एडाप्टर (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "प्रयोग:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4289,420 +4689,476 @@ msgstr ""
 "यह प्रोग्राम NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/) "
 "का घटक है."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "यह कमांड लाइन अंतःक्रिया के लिए वांछित नहीं है बजाय GNOME डेस्कटॉप वातावरण में चलता है."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "सक्रिय नहीं"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "पंजीकृत नहीं"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "घर संजाल (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "घर संजाल"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "खोज रहा है"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "पंजीयन मना"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s रोमिंग)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (रोमिंग)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "रोमिंग संजाल (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "रोमिंग संजाल"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "सिम कार्ड '%s' के लिए '%s' पर पिन कोड"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "पिन कोड जरूरी"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "पिन कोड मोबाइल ब्रॉडबैंड युक्ति के लिए जरूरी है"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' सक्रिय: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "रोमिंग"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s कनेक्शन"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER या PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, या PKCS#12 निजी कुंजी (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फ़ाइल चुनें ..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC फ़ाइल (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "सभी फ़ाइलें"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "अज्ञात"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "सत्यापित"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "दोनों"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "बेनाम पहचान (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC फाइल: (_F)"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "आंतरिक सत्यापन: (_I)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "स्वत: PAC pro_visioning की अनुमति दें"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "एमडी5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "सर्टिफिकेट ऑथरिटी प्रमाणपत्र चुनें."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "संस्करण 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "संस्करण 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "सीए प्रमाणपत्र (_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP संस्करण: (_v)"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit पासफ्रेज"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "कूटशब्द दिखाएँ (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "पहचान (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "टीएलएस"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "तीव्र"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "टनेल किया टीएलएस"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "संरक्षित EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "सत्यापन: (_t)"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (तयशुदा)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "खुला तंत्र"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "साझा कुंजी"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (तयशुदा)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "कुंजी: (_K)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "कुंजी दिखाएँ (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP सूची (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "प्रकार (_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s डिफ़ॉल्ट"
+
+#~ msgid "Ignored"
+#~ msgstr "नज़रअंदाज़ किया"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "कनेक्शन गुप्तता को अद्यतन करने में विफल किसी अज्ञात त्रुटि के कारण."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "प्राथमिकता: (_P)"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "स्वचालित रूप से इस नेटवर्क से कनेक्ट जब यह उपलब्ध है (_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "कनेक्शन जानकारी (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN कनेक्शन आय़ात नहीं कर सका"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "फाइल '%s' पढ़ा नहीं जा सका अथवा कोई परिचित VPN कनेक्शन सूचना को समाहित नहीं कर "
+#~ "सका\n"
+#~ "\n"
+#~ "त्रुटि: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "अज्ञात त्रुटि"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "सर्टिफिकेट ऑथरिटी प्रमाणपत्र चुनें."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "सीए प्रमाणपत्र (_A):"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "नेटवर्क मैनेजर"
@@ -4736,15 +5192,6 @@ msgstr "प्रकार (_T):"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegotiate"
 
@@ -4838,12 +5285,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "द्वितीयक DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "त्रिगुट DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "युक्ति MAC पता: (_D)"
 
@@ -4896,14 +5337,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "स्वचालित (PPP) पता केवल"
 
-#~| msgid "Could not load Wi-Fi user interface."
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX उपयोक्ता अंतरफलक लोड नहीं कर सका."
-
-#~| msgid "Wired connection %d"
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX संबंधन %d"
-
 #~| msgid ""
 #~| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 #~ msgid ""
@@ -4927,9 +5360,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "Error: %s"
 #~ msgstr "त्रुटि: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN कनेक्शन बनाने में विफल: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "आपका फोन अब उपयोग के लिए तैयार!"
 
@@ -5026,12 +5456,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "Wireless connection %d"
 #~ msgstr "बेतार संबंधन %d"
 
-#~ msgid "_Import"
-#~ msgstr "आयात करें (_I)"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "स्वतः कनेक्ट करें (_a)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "सभी उपयोक्ता के लिए उपलब्ध"
 
@@ -5076,9 +5500,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "Unknown"
 #~ msgstr "अज्ञात"
 
-#~ msgid "translator-credits"
-#~ msgstr "राजेश रंजन (rranjan@redhat.com, rajeshkajha@yahoo.com)"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\"> सक्रिय नेटवर्क कनेक्शन्स</span>"
diff --git a/po/hr.po b/po/hr.po
index e03c1252..4db9297c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-03-08 17:05+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-03-27 16:14+0100\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -21,7 +21,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2017-04-09 22:32+0000\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Mreža"
 
@@ -203,7 +204,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "802.1X ovjera"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -441,117 +442,117 @@ msgstr "uređaj nije upravljiv"
 msgid "No network devices available"
 msgstr "Nema dostupnih mrežnih uređaja"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN povezivanja"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Podesi VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Dodaj VPN povezivanje…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Mrežni upravitelj nije pokrenut…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Umrežavanje onemogućeno"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Omogući _umrežavanje"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Omogući _bežičnu mrežu"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilno širokopojasno povezivanje"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Omogući _obavjesti"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informacije povezivanja"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Uređivanje povezivanja…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O programu"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Sada ste povezani s “%s”."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Povezivanje prekinuto"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Mrežno povezivanje je prekinuto."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Priprema mrežnog povezivanja “%s”…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Za mrežno povezivanje “%s” je potrebna ovjera korisnika…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Zahtijevanje mrežne adrese za “%s”…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Mrežno povezivanje “%s” je aktivno"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Pokretanje VPN povezivanja “%s”…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Za VPN povezivanje “%s” je potrebna ovjera korisnika…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Zahtijevanje VPN adrese za “%s”…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN povezivanje je aktivno"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nema mrežnog povezivanja"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet mrežnog upravitelja"
 
@@ -568,7 +569,7 @@ msgstr "Pogrešan PIN; kontaktirajte svojeg pružatelja usluge."
 msgid "Sending unlock code…"
 msgstr "Slanje kôda za otključavanje…"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilno širokopojasno povezivanje (%s)"
@@ -690,7 +691,7 @@ msgstr "Žično povezivanje “%s” je aktivno"
 msgid "DSL authentication"
 msgstr "DSL ovjera"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -799,179 +800,188 @@ msgstr "Bežično povezivanje “%s” je aktivno"
 msgid "Failed to activate connection"
 msgstr "Neuspjelo aktiviranje povezivanja"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Greška prikaza informacija povezivanja:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Promjenjivi WEP"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Više adresa"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nijedna"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznata"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresa emitiranja"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Maska podmreže"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "Glavni DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "Pomoćni DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "Pričuvni DNS"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Žična mreža (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Općenito"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardverska adresa"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Upravljački program"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Brzina"
 
-#: src/applet-dialogs.c:584
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Sigurnost"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Uobičajena ruta"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Pristupna točka"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN vrsta"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN pristupnik"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN korisničko ime"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN natpis"
 
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Osnovno povezivanje"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nije pronađeno valjano aktivno povezivanje!"
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -981,24 +991,24 @@ msgstr ""
 "Autorsko pravo © 2005-2008 Novell, Inc.\n"
 "i mnogi drugi doprinositelji i prevoditelji iz zajednice"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet trake sustava za upravljanje vašim mrežnim uređajima i mrežnim "
 "povezivanjima."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Web stranica mrežnog upravitelja"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1006,33 +1016,33 @@ msgstr ""
 "Aplet mrežnog upravitelja nije uspio pronaći potrebne resurse (.ui datoteka "
 "nije pronađena)."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Nedostaju resursi"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Lozinka za mobilnu širokopojasnu mrežu"
 
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Potrebna je lozinka za povezivanje s “%s”."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Potreban je SIM PIN za otključavanje"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Potreban je SIM PIN za otključavanje"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1042,25 +1052,25 @@ msgstr ""
 "korištenja."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kôd:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Prikaži PIN kôd"
 
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je SIM PUK otključavanje"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Potrebno je SIM PUK otključavanje"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1070,35 +1080,35 @@ msgstr ""
 "otključavanja."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kôd:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Novi PIN kôd:"
 
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Ponovno upišite novi PIN kôd:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kôdove"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Povezivanje nema VPN postavke"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Neuspjelo zapisivanje povezivanja na VPN UI: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Neuspjelo zapisivanje povezivanja na VPN UI: nepotpuni zapis"
 
@@ -3007,10 +3017,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Klijent"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Pristupna točka"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
@@ -3875,12 +3881,12 @@ msgstr ""
 "Moj pružatelj usluge koristi tehnologiju temeljenu na C_DMA-u (tj. 1xRTT, "
 "EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4155,6 +4161,10 @@ msgstr "Informacije povezivanja"
 msgid "_Close"
 msgstr "_Zatvori"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4198,32 +4208,28 @@ msgstr "%s _vjerodajnica"
 msgid "My country is not listed"
 msgstr "Moja država nije navedena"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nenavedeno"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Moj plan nije naveden…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Pružatelj usluge"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Država ili regija"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMA uređaj"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Bilo koji uređaj"
 
@@ -4257,23 +4263,24 @@ msgstr ""
 "(u nekim slučajevima) NPT (Naziv Pristupne Točke) vašeg plana naplate "
 "mobilnog interneta"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Stvori povezivanje za _ovaj uređaj mobilnog širokopojasnog Interneta:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Postavite povezivanje mobilnog širokopojasnog Interneta"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Popis država ili regija:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Država ili regija"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Odaberite državu ili regiju vašeg pružatelja usluge"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Odaberite svojeg pružatelja usluge s _popisa:"
 
@@ -4551,6 +4558,14 @@ msgstr "Ne mogu pronaći svojeg pružatelja usluge i želim ga unijeti _ručno:"
 msgid "Provider:"
 msgstr "Pružatelj usluge:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Popis država ili regija:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Država ili regija"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Žična mreža"
diff --git a/po/hu.po b/po/hu.po
index e489dbb9..abec9670 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/is"
-"sues\n"
-"POT-Creation-Date: 2019-03-08 17:05+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-03-18 08:12+0100\n"
 "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -23,7 +23,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Hálózat"
 
@@ -209,7 +210,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "802.1X hitelesítés"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -452,118 +453,118 @@ msgstr "az eszköz nem kezelt"
 msgid "No network devices available"
 msgstr "Nem érhetők el hálózati eszközök"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN kapcsolatok"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "V_PN beállítása…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "VPN kapcsolat hozzá_adása…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "A Hálózatkezelő nem fut…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Hálózat kikapcsolva"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Hálózat bekapcsolása"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Wi-Fi bekapcsolása"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil széles sáv bekapcsolása"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Ért_esítések bekapcsolása"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Kapcsolatinformációk"
 
 # Megjegyzés: Itt a magyar fordításban hozzárendeltem gyorsbillentyűt a fordításhoz, az angolban eredetileg nincs.
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Kap_csolatok szerkesztése…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Névjegy"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Kapcsolódott ehhez: „%s”."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "A hálózati kapcsolat bontva."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "A hálózati kapcsolat („%s”) előkészítése…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "A felhasználó hitelesítése szükséges a hálózati kapcsolathoz („%s”)…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Hálózati cím kérése a következőhöz: „%s”…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "A hálózati kapcsolat („%s”) aktív"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "A VPN kapcsolat („%s”) indítása…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "A felhasználó hitelesítése szükséges a VPN kapcsolathoz („%s”)…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "VPN cím kérése ehhez: „%s”…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "A VPN kapcsolat aktív"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Hálózatkezelő kisalkalmazás"
 
@@ -580,7 +581,7 @@ msgstr "A PIN-kód hibás, keresse meg szolgáltatóját."
 msgid "Sending unlock code…"
 msgstr "Feloldási kód küldése…"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobil széles sáv (%s)"
@@ -704,7 +705,7 @@ msgstr "A vezetékes hálózati kapcsolat („%s”) aktív"
 msgid "DSL authentication"
 msgstr "DSL hitelesítés"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -812,179 +813,188 @@ msgstr "A Wi-Fi hálózati kapcsolat („%s”) aktív"
 msgid "Failed to activate connection"
 msgstr "Nem sikerült aktiválni a kapcsolatot"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Hiba a kapcsolatinformációk megjelenítése közben:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamikus WEP"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "További címek"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nincs"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP cím"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast cím"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Alhálózati maszk"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "Elsődleges DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "Másodlagos DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "Harmadlagos DNS"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Általános"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Csatoló"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardvercím"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Illesztőprogram"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Sebesség"
 
-#: src/applet-dialogs.c:584
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Biztonság"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Alapértelmezett útvonal"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Jelszó:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN típusa"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN átjáró"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN felhasználónév"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN fejléc"
 
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Alapkapcsolat"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nem találhatók érvényes aktív kapcsolatok!"
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -994,54 +1004,54 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "és sok más közösségi közreműködő és fordító"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok "
 "kezelésére."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "A Hálózatkezelő webhelye"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Meskó Balázs <mesko.balazs at fsf dot hu>"
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "A Hálózatkezelő kisalkalmazás nem talál néhány szükséges .ui fájlt."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Hiányzó erőforrások"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobil széles sávú hálózat jelszava"
 
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Jelszó szükséges a kapcsolódáshoz a következőhöz: „%s”."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "A SIM PIN feloldása szükséges"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "A SIM PIN feloldása szükséges"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1050,25 +1060,25 @@ msgstr ""
 "A(z) „%s” mobil széles sávú eszköz használatához a SIM PIN-kód szükséges."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kód:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN-kód megjelenítése"
 
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "A SIM PUK feloldása szükséges"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "A SIM PUK feloldása szükséges"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1077,35 +1087,35 @@ msgstr ""
 "A(z) „%s” mobil széles sávú eszköz használatához a SIM PUK-kód szükséges."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kód:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Új PIN-kód:"
 
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Írja be újra az új PIN-kódot:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK-kódok megjelenítése"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "A kapcsolatnak nem volt VPN beállítása"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Nem sikerült kiírni a kapcsolatot a VPN felületre: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Nem sikerült kiírni a kapcsolatot a VPN felületre: hiányos kiírás"
 
@@ -3020,10 +3030,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Kliens"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Hotspot"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Eseti"
@@ -3878,12 +3884,12 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "A szolgáltatóm C_DMA-alapú technológiát használ (azaz 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4158,6 +4164,10 @@ msgstr "Kapcsolatinformációk"
 msgid "_Close"
 msgstr "_Bezárás"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4201,32 +4211,28 @@ msgstr "%s _tanúsítvány"
 msgid "My country is not listed"
 msgstr "Az ország nincs felsorolva"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Egyéb"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "A tarifám nincs felsorolva…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Szolgáltató"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Ország vagy terület"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Telepített GSM eszköz"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Telepített CDMA eszköz"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Bármely eszköz"
 
@@ -4260,23 +4266,24 @@ msgstr ""
 "(egyes esetekben) Széles sávú előfizetéséhez tartozó APN (hozzáférési pont "
 "neve)"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "_Kapcsolat létrehozása ezen mobil széles sávú eszközhöz:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobil széles sávú kapcsolat beállítása"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Ország- vagy területlista:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Ország vagy terület"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Válassza ki a szolgáltató országát vagy területét"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "_Válassza ki szolgáltatóját listából:"
 
@@ -4554,6 +4561,14 @@ msgstr "_Nem találom a szolgáltatómat és saját kezűleg szeretném megadni:
 msgid "Provider:"
 msgstr "Szolgáltató:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Ország- vagy területlista:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Ország vagy terület"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Vezetékes"
diff --git a/po/id.po b/po/id.po
index 24c495bf..9117ce0e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-08-20 08:21+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-08-27 14:58+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
@@ -22,49 +22,58 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Jaringan"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Mengelola koneksi jaringan Anda"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Koneksi Jaringan"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Konfigurasi Mentah"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Kelola dan ubah tatanan koneksi jaringan Anda"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Matikan pemberitahuan saat tersambung"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Tata ke true untuk mematikan pemberitahuan ketika menyambung ke suatu "
 "jaringan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Matikan pemberitahuan saat terputus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Tata ke true untuk mematikan pemberitahuan ketika terputus dari suatu "
 "jaringan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Matikan pemberitahuan VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -72,49 +81,50 @@ msgstr ""
 "Tata ke true untuk mematikan pemberitahuan ketika tersambung atau terputus "
 "dari suatu VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Redam pemberitahuan bahwa jaringan tersedia"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Tata ke true untuk mematikan pemberitahuan ketika jaringan Wi-Fi tersedia."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stamp"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Dipakai untuk menentukan apakah tatanan mesti dipindah ke versi baru."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Matikan Pembuatan Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Tata ke true untuk mencegah pembuatan jaringan adhoc ketika memakai aplet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Tampilkan aplet di area pemberitahuan"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Isi dengan FALSE untuk menonaktifkan penampilan aplet dalam area "
 "pemberitahuan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Abaikan sertifikat CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -122,7 +132,7 @@ msgstr ""
 "Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA dalam "
 "otentikasi EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -130,15 +140,15 @@ msgstr ""
 "Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA dalam "
 "otentikasi EAP fasa 2."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Penyunting koneksi NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -146,7 +156,7 @@ msgstr ""
 "NetworkManager adalah sebuah layanan sistem untuk mengelola dan menata "
 "perangkat dan koneksi jaringan Anda."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -154,38 +164,38 @@ msgstr ""
 "Program nm-connection-editor bekerja dengan NetworkManager untuk membuat dan "
 "menyunting profil koneksi yang ada untuk NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Para Pengembang NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "kelas objek '%s' tidak punya properti bernama '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "properti '%s' dari kelas objek '%s' tidak dapat ditulisi"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 "properti construct \"%s\" bagi objek '%s' tak bisa ditata setelah konstruksi"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "'%s::%s' bukan nama properti yang valid; '%s' bukan sub tipe GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "tidak bisa menata properti '%s' bertipe '%s' dari nilai bertipe '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -194,81 +204,80 @@ msgstr ""
 "nilai \"%s\" bertipe '%s' tidak valid atau di luar jangkauan untuk properti "
 "'%s' bertipe '%s'"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Otentikasi 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1068
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Sambung"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nama jaringan"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "aman."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Gagal menambah/mengaktifkan koneksi"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Galat tak dikenal"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Kegagalan koneksi"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Pemutusan perangkat gagal"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Pemutusan gagal"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivasi koneksi gagal"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Jangan tunjukkan pesan ini lagi"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +287,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" terputus karena koneksi jaringan terinterupsi."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -288,7 +297,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena koneksi jaringan terinterupsi."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -297,7 +306,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena layanan VPN berhenti tak disangka-sangka."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +317,7 @@ msgstr ""
 "Koneksi VPN \"%s\" gagal karena layanan VPN mengembalikan konfigurasi yang "
 "tidak benar."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +326,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena batas waktu percobaan koneksi habis."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +335,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena layanan VPN tidak mulai pada waktunya."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +344,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena layanan VPN gagal dijalankan."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -344,7 +353,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena tidak ada kode rahasia VPN yang valid."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -353,7 +362,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal karena kode rahasia VPN yang tidak valid."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +371,7 @@ msgstr ""
 "\n"
 "Koneksi VPN \"%s\" gagal."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -373,19 +382,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Koneksi VPN telah sukses dijalin.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Pesan Login VPN"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Koneksi VPN Gagal"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -398,7 +407,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -411,560 +420,571 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "perangkat tak siap (tak ada firmware)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "perangkat tak siap"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "terputus"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Putuskan"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "perangkat tidak dikelola"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Tak ada perangkat jaringan yang tersedia"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Koneksi _VPN"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "Mena_ta VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Men_ambah suatu koneksi VPN…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager tidak sedang berjalan…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Fungsi jaringan dimatikan"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Fungsika_n Jaringan"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Fungsikan Ni_rkabel"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Fungsikan _Data Seluler"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Fungsikan N_otifikasi"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informasi Koneksi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Sunting Koneksi…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Anda sekarang tersambung ke \"%s\"."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Terputus"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Koneksi jaringan terputus."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Menyiapkan koneksi jaringan \"%s\"…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Otentikasi pengguna diperlukan untuk koneksi jaringan \"%s\"…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Meminta alamat jaringan untuk \"%s\"…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Koneksi jaringan \"%s\" aktif"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Memulai koneksi VPN \"%s\"…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Otentikasi pengguna diperlukan untuk koneksi VPN \"%s\"…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Meminta alamat VPN untuk \"%s\"…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Koneksi VPN aktif"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Tak ada koneksi jaringan"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK salah; silakan kontak operator Anda."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN salah; silakan kontak operator Anda."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Mengirim kode pembuka…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Data Seluler (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Data Seluler"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tersedia"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Koneksi Data Seluler baru…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Koneksi Terjalin"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Anda kini tersambung ke jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Anda kini terdaftar ke jaringan rumah."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Anda kini terdaftar ke jaringan roaming."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Anda kini tersambung ke jaringan data seluler."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Menyiapkan koneksi data seluler \"%s\"…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mengatur koneksi data seluler \"%s\"…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Otentikasi pengguna dibutuhkan untuk koneksi data seluler \"%s\"…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Koneksi data seluler \"%s\" aktif"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet Otomatis"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Jaringan Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Jaringan Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Jaringan Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Jaringan Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Anda sekarang tersambung ke jaringan ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Menyiapkan koneksi jaringan ethernet \"%s\"…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Mengatur koneksi jaringan ethernet \"%s\"…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Otentikasi pengguna diperlukan untuk koneksi jaringan ethernet \"%s\"…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Meminta alamat jaringan ethernet untuk \"%s\"…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Koneksi jaringan ethernet \"%s\" aktif"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Otentikasi DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Sambungkan ke Jaringan Wi-Fi Tersembunyi…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Buat Jari_ngan Wi-Fi Baru…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Gagal menambahkan koneksi baru"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Privilese tidak cukup."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Jaringan Wi-Fi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi dinonaktifkan"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi dinonaktifkan oleh saklar perangkat keras"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Jaringan lain"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Jaringan Wi-Fi Tersedia"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Gunakan menu jaringan untuk menyambung ke jaringan Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Anda sekarang tersambung ke jaringan Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Menyiapkan koneksi jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Mengatur koneksi jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Otentikasi pengguna diperlukan untuk jaringan Wi-Fi \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Meminta alamat jaringan Wi-Fi untuk \"%s\"…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Koneksi jaringan Wi-Fi \"%s\" aktif: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Koneksi jaringan Wi-Fi \"%s\" aktif"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Gagal mengaktifkan koneksi"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Galat menampilkan informasi koneksi:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP Dinamis"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Lebih banyak alamat"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nihil"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (bawaan)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Alamat IP"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Alamat Broadcast"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mask Subnet"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primer"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Sandi _Sekunder:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Umum"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Antarmuka"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Alamat Perangkat Keras"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Kecepatan"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Keamanan:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Rute Utama"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Diabaikan"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Sandi:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipe VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Gateway VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nama Pengguna VPN"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Banner VPN"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Koneksi Dasar"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tak dikenal"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Tak ditemukan koneksi aktif yang valid!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -974,24 +994,24 @@ msgstr ""
 "Hak cipta © 2005-2008 Novell, Inc.\n"
 "dan banyak penerjemah dan para kontributor komunitas"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet wilayah pemberitahuan untuk mengelola perangkat dan koneksi jaringan "
 "Anda."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Situs Web NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018.\n"
 "Andika Triwidada <andika@gmail.com>, 2018."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -999,33 +1019,33 @@ msgstr ""
 "Aplet NetworkManager tidak dapat menemukan beberapa sumberdaya yang "
 "diperlukan (berkas .ui tidak ditemukan)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Sumber daya hilang"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Sandi jaringan data seluler"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Diperlukan sandi untuk tersambung pada \"%s\"."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Sandi:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Perlu PIN SIM"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Perlu PIN SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1034,25 +1054,25 @@ msgstr ""
 "Perangkat data seluler \"%s\" memerlukan kode PIN sebelum dapat dipakai."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Kode PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Tampilkan kode PIN"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Perlu PUK SIM"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Perlu PUK SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1061,41 +1081,41 @@ msgstr ""
 "Perangkat data seluler \"%s\" memerlukan kode PUK sebelum dapat dipakai."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Kode PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Kode PIN baru:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Masukkan lagi kode PIN baru:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Tampilkan kode PIN/PUK"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Koneksi tidak memiliki pengaturan VPN"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Gagal menulis koneksi ke UI VPN: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Gagal menulis koneksi ke UI VPN: tidak lengkap menulis"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1103,41 +1123,41 @@ msgstr ""
 "Alamat IP menandai komputer Anda pada jaringan. Klik tombol \"Tambah\" untuk "
 "menambah suatu alamat IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "T_ambah"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Hapus"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Abaika_n route yang diperoleh secara otomatis"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "G_unakan koneksi ini hanya untuk sumber daya pada jaringannya"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1145,15 +1165,15 @@ msgstr ""
 "Bila diaktifkan, koneksi ini tidak akan pernah bisa digunakan sebagai "
 "koneksi jaringan baku."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "_Buat…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Pilih Tipe Koneksi"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1165,84 +1185,93 @@ msgstr ""
 "Bila Anda membuat suatu VPN, dan koneksi VPN yang ingin Anda buat tidak "
 "muncul pada daftar, mungkin Anda belum memasang plugin VPN yang tepat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Peranti"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Cadangan aktif"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Penyeimbangan beban pancar adaptif"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Penyeimbangan beban adaptif"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (disarankan)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "_Koneksi bond"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "M_ode"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "_Frekuensi pemantauan"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Nama _antarmuka"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "Pemantauan _Link"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "_Target ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1250,19 +1279,19 @@ msgstr ""
 "Suatu alamat IP, atau daftar alamat IP yang dipisah koma, untuk dicari "
 "ketika memeriksa status link."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "T_undaan link menyala"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Tun_daan link mati"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Primer"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1270,66 +1299,69 @@ msgstr ""
 "Nama antar muka dari perangkat primer. Bila diisi, perangkat ini akan selalu "
 "menjadi slave aktif ketika tersedia."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bita"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "Bi_aya path"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Prioritas"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "Mode _hairpin"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Koneksi _bridge"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Tundaan _forward"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "Waktu _hello"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Tundaan penerusan STP, dalam detik"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Tundaan waktu hello, dalam detik"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Fungsikan snooping I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1339,17 +1371,17 @@ msgstr ""
 "bahwa bila snooping dinonaktifkan secara otomatis karena tabrakan hash, "
 "sistem mungkin menolak memfungsikan fitur sampai tabrakan dipecahkan."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Fungsikan _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "Mengendalikan apakah Spanning Tree Protocol (STP) difungsikan bagi bridge ini"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1357,27 +1389,27 @@ msgstr ""
 "Prioritas STP untuk bridge ini. Nilai lebih rendah \"lebih baik\"; bridge "
 "dengan prioritas terrendah akan diangkat sebagai bridge root."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "Usia _maks"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Usia pesan STP maksimum, dalam detik"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "Waktu penu_aan"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Waktu penuaan alamat MAC Ethernet, dalam detik"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Mask _penerusan grup"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1389,40 +1421,40 @@ msgstr ""
 "atau 2 mask tidak boleh diisi 1 karena mereka dipakai untuk STP, bingkai "
 "jeda MAC, dan LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "otomatis"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "baku"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "kesalahan tidak jelas"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Pertahankan"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Permanen"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Acak"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabil"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1432,181 +1464,224 @@ msgstr ""
 "keras bagi perangkat jaringan untuk koneksi yang diaktifkan. Fitur ini "
 "dikenal sebagai klon atau spoof MAC. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Alamat MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Alamat HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s tidak valid bagi %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s tak valid (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "nama antar muka tidak valid bagi %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nama antar muka tidak valid (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "tak bisa mengurai nama perangkat"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "alamat perangkat keras tidak valid"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "%s tak valid (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "perangkat"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "%s tak valid (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "G_unakan Data Center Bridging (DCB) untuk koneksi ini"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Kendali Alir"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Fitur"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Fungsikan"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Umumkan"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Bersedia"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Opsi…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grup Prioritas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Kendali Alir Prioritas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Fungsikan atau matikan transmisi jeda prioritas bagi setiap Prioritas "
 "Pengguna."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Kelas Trafik"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Lebar Pita Ketat"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Lebar Pita Prioritas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Lebar Pita Grup"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "ID Grup"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Masukkan ID grup prioritas bagi setiap Prioritas Pengguna."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1614,35 +1689,35 @@ msgstr ""
 "Masukkan persen lebar pita saluran yang boleh dipakai oleh setiap Grup "
 "Prioritas. Jumlah dari semua grup mesti 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Masukkan persentase dari lebar pita grup prioritas yang boleh dipakai oleh "
 "setiap prioritas pengguna."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Fungsikan atau matikan lebar pita ketat bagi setiap prioritas pengguna."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Masukkan kelas trafik bagi setiap prioritas pengguna."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "Nama Pengg_una"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Nama pengguna digunakan untuk mengotentikasi dengan layanan PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1650,52 +1725,51 @@ msgstr ""
 "Hanya memulai sesi dengan konsentrator akses yang menyediakan layanan yang "
 "ditentukan. Bagi sebagian besar penyedia, ini harus dibiarkan kosong."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Layanan"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Tampilkan _sandi"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Kata sandi digunakan untuk mengotentikasi dengan layanan PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Sandi"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "A_ntarmuka PPP"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Antarmuka induk"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Nama sebarang untuk diberikan pada antarmuka PPP yang baru dibuat."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Antarmuka koneksi PPP akan terbentuk."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "Antarmuka k_laim"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1707,137 +1781,130 @@ msgstr ""
 "dapat digunakan untuk antarmuka Ethernet. nm-applet hanya dapat mengaktifkan "
 "koneksi jika opsi ini dipilih."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Separuh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Penuh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Abaikan"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Atur sendiri"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Peranti"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "Alamat MAC _klon"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Wake on LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Baku"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "Aba_ikan"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "Sandi _Wake on LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Sandi Wake-on-LAN (suatu MAC Ethernet). Ini hanya valid untuk paket ajaib."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Negosiasi _koneksi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1847,11 +1914,11 @@ msgstr ""
 "\" dan \"Dupleks\" akan dipaksa tanpa memeriksa kompatibilitas perangkat. "
 "Bila tidak yakin, biarkan \"Abaikan\" di sini atau pilih \"Otomatis\"."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "Kecepatan"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1861,11 +1928,11 @@ msgstr ""
 "\"Abaikan\" dan \"Otomatis\" tidak dipilih. Sebelum menyatakan suatu nilai "
 "kecepatan, pastikan bahwa perangkat Anda mendukungnya."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_ks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1875,31 +1942,31 @@ msgstr ""
 "\"Abaikan\" dan \"Otomatis\" tidak dipilih. Sebelum menyatakan suatu mode "
 "dupleks pastikan bahwa perangkat Anda mendukungnya."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Ya"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Tidak"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Semua pengg_una boleh menyambung ke jaringan ini"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Otomatis tersambung ke _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "_Zona firewall"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "Ko_neksi terukur"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1911,11 +1978,11 @@ msgstr ""
 "untuk menunjukkan aplikasi, atau \"Otomatis\" untuk menggunakan nilai bawaan "
 "berdasarkan jenis koneksi dan heuristik lainnya."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Sambungkan secara otom_atis dengan prioritas"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1925,7 +1992,7 @@ msgstr ""
 "lebih disukai ketika memilih profil untuk aktivasi otomatis. Nilai baku "
 "adalah 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1934,7 +2001,7 @@ msgstr ""
 "menambah alamat IP statik untuk dikonfigurasi sebagai tambahan ke yang "
 "otomatis."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1946,126 +2013,125 @@ msgstr ""
 "untuk menambahkan sebuah alamat IP. Bila tidak ada alamat yang diberikan, "
 "rentang akan ditentukan secara otomatis."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Alamat statik tambahan"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Alamat (opsional)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Terhubung"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "Mode _transport"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Nama perangkat"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Peranti induk"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Mode"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "IP lokal"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "IP remote"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Kunci masukan"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Kunci keluaran"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Otomatis dengan pengaturan DNS manual"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Link-Lokal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Berbagi dengan komputer lain"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Metode"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2075,8 +2141,8 @@ msgstr ""
 "konfigurasi komputer Anda. Bila Anda ingin memakai suatu identifier klien "
 "DHCP, masukkan disini."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2084,25 +2150,23 @@ msgstr ""
 "Domain yang digunakan untuk mengurai nama host. Gunakan koma untuk "
 "memisahkan beberapa domain."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "ID klien D_HCP"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "Ranah p_encarian"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "Ser_ver DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2110,11 +2174,11 @@ msgstr ""
 "Alamat IP dari server nama domain dipakai untuk menerjemahkan nama host. "
 "Gunakan koma untuk memisahkan alamat beberapa server nama domain."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Memerlukan pengalamatan IPv_4 agar koneksi ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2122,34 +2186,34 @@ msgstr ""
 "Ketika menyambung ke jaringan yang mampu-IPv6, memungkinkan koneksi komplit "
 "bila konfigurasi IPv4 gagal tetapi konfigurasi IPv6 sukses."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Route…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Dimatikan"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Difungsikan (lebih suka alamat publik)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Difungsikan (lebih suka alamat sementara)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Privasi Stabil"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2159,19 +2223,19 @@ msgstr ""
 "Gunakan koma untuk memisahkan alamat beberapa server nama domain. Alamat "
 "link-local akan secara otomatis di-scope ke antar muka penyambung."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "Ekstensi _privasi IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "_Mode pembuatan alamat IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Memerlukan pengalamatan IPv_6 agar koneksi ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2179,28 +2243,28 @@ msgstr ""
 "Ketika menyambung ke jaringan yang mampu-IPv4, memungkinkan koneksi komplit "
 "bila konfigurasi IPv6 gagal tetapi konfigurasi IPv4 sukses."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Periksa"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Ketat"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Nama perangkat MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2208,7 +2272,7 @@ msgstr ""
 "Nama antarmuka induk atau koneksi induk UUID dari mana antarmuka MACsec ini "
 "harus dibuat."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2216,15 +2280,15 @@ msgstr ""
 "Nama antarmuka induk atau koneksi induk UUID dari mana antarmuka MACsec ini "
 "harus dibuat"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Nama Kunci Konektivitas-asosiasi pre-shared"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Kunci Konektivitas Asosiasi pre-shared"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2234,199 +2298,200 @@ msgstr ""
 "Key Agreement) diperoleh. Untuk mode EAP, isilah parameter di halaman "
 "keamanan 802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Kunci"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parameter"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Validasi"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "Port SCI"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Menentukan mode validasi untuk frame masuk"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Enkripsi"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Apakah lalu lintas yang ditransmisikan harus dienkripsi"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Komponen port dari SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Dasar"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "No_mor"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "ID Jari_ngan"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Ganti…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Ijinkan _roaming bila jaringan rumah tak tersedia"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Tampilkan sandi"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Otentikasi"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Metoda yang diizinkan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Atur _Metoda…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Kompresi"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "G_unakan point-to-point encryption (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Pe_rsyaratkan enkripsi 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Gunakan _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Ijinkan pemampatan data _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Ijinkan pemampatan data _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Gunakan pemampatan _header TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Kirim paket _echo PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Nihil"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Hanya untuk peramban"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Gunakan konfigurasi proksi ini hanya untuk skema/klien peramban."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "URL PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "Skrip PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL darimana skrip PAC akan diperoleh."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Impor skrip dari suatu berkas…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Metode"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Tingkat _Lanjut…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Diatur oleh induk"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Keadaan port ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Opsi Tingkat Lanjut Team"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "ID _Antrian"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2434,20 +2499,20 @@ msgstr ""
 "Cacah rentetan NA yang tidak diminta dan paket ARP serampangan yang dikirim "
 "setelah port difungsikan atau dinonaktifkan."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID antrian yang mestinya port ini dipetakan padanya."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Opsi pelari Aktif-Backup"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Prioritas port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2455,39 +2520,33 @@ msgstr ""
 "Nilai adalah bilangan positif dalam milidetik. Menyatakan selang waktu "
 "antara rentetan dari paket notify-peer."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 "Prioritas port. Angka yang lebih tinggi berarti prioritas lebih tinggi."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _lengket"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
-"Validasikan paket ARP yang diterima pada port aktif. Bila ini tidak "
-"dicentang, semua paket ARP yang datang akan dianggap sebagai jawaban yang "
-"bagus."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Opsi pelari LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "Prioritas port _LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "_Kunci port LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2495,7 +2554,7 @@ msgstr ""
 "Cacah rentetan permintaan gabung ulang grup multicast yang dikirim setelah "
 "port difungsikan atau dinonaktifkan."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2503,8 +2562,8 @@ msgstr ""
 "Prioritas port menurut standar LACP. Angka yang lebih rendah berarti "
 "prioritas lebih tinggi."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2512,7 +2571,7 @@ msgstr ""
 "Nilai adalah bilangan positif dalam milidetik. Menyatakan selang waktu antar "
 "rentetan dari permintaan gabung ulang grup multicast."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2520,48 +2579,48 @@ msgstr ""
 "Kunci port menurut standar LACP. Ini hanya mungkin mengagregasi port dengan "
 "kunci yang sama."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "Pemantau _link"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "T_undaan menyala"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Tun_daan mati"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "Selang waktu k_irim"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Tundaan se_belum kiriman pertama"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Maksimum jawaban yang meleset"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "Host _sumber"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "Host _target"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2569,8 +2628,8 @@ msgstr ""
 "Banyaknya maksimum jawaban yang tidak tertangkap. Bila angka ini terlampaui, "
 "link dilaporkan sebagai mati."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2578,8 +2637,8 @@ msgstr ""
 "Nama host yang akan dikonversi ke alamat IP yang akan diisikan ke permintaan "
 "ARP sebagai alamat sumber."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2587,18 +2646,28 @@ msgstr ""
 "Nama host yang akan dikonversi ke alamat IP yang akan diisikan ke permintaan "
 "sebagai alamat tujuan."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Abaikan paket yang tidak valid dari port _aktif"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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 ""
+"Validasikan paket ARP yang diterima pada port aktif. Bila ini tidak "
+"dicentang, semua paket ARP yang datang akan dianggap sebagai jawaban yang "
+"bagus."
+
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Abaikan paket yang tidak valid dari port ya_ng tidak aktif"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2607,13 +2676,13 @@ msgstr ""
 "tidak dicentang, semua paket ARP yang datang akan dianggap sebagai jawaban "
 "yang bagus."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "K_irim pada port yang tidak aktif"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2621,159 +2690,158 @@ msgstr ""
 "Secara baku, permintaan ARP dikirim hanya pada port yang aktif. Opsi ini "
 "mengizinkan pengiriman bahkan pada port yang tidak aktif."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr "Tundaan antara link mulai hidup dan pelari diberitahu tentangnya."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "Tundaan antara link menuju mati dan pelari diberitahu tentangnya."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Selang waktu antar pengiriman permintaan."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Tundaan antara inisialisasi pemantauan link dan pengiriman permintaan "
 "pertama."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Pemantau link yang akan dipakai."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Pemantau Link"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "_Impor konfigurasi tim dari suatu berkas…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Sunting konfigurasi _JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Konfigurasi Mentah"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Prioritas tertinggi"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Prioritas tertinggi (stabil)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Lebar Pita"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Nomor tertinggi port"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Prioritas port"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Dari perangkat team"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Dari port aktif"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Dari aktif ke perangkat team"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Koneksi _team"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Penyeimbangan beban"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Sebarang protokol L3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Sebarang protokol L4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Cacah pemberitahuan _peer"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Selang waktu pemberitahua_n peer"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "Cacah gabung ulang _multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "_Selang waktu gabung ulang multicast"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "Alamat Perangkat Keras"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2781,19 +2849,19 @@ msgstr ""
 "Alamat perangkat keras yang diinginkan untuk perangkat team baru. Format "
 "alamat MAC yang biasa dapat dipakai."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "Pela_ri"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Kebijakan _alamat perangkat keras"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Nama pelari yang akan dipakai."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2801,11 +2869,11 @@ msgstr ""
 "Ini menentukan kebijakan bagaimana alamat perangkat keras dari perangkat "
 "team dan perangkat port mesti ditata selama masa hidup team."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Kirim frame LACPDU secara _periodik"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2813,11 +2881,11 @@ msgstr ""
 "Bila dicentang, frame LACPDU dikirim melalui link yang ditata secara "
 "periodik. Bila tidak, itu beraksi secara \"menjawab ketika diajak bicara\"."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Kirim sebuah frame LACPDU s_etiap detik"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2827,23 +2895,23 @@ msgstr ""
 "LACPDU. Bila dicentang, paket akan dikirim sekali per detik. Bila tidak "
 "mereka akan dikirim setiap 30 detik."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "Prioritas _sistem"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "Port _minimum"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Kebijakan pemilihan _agregator"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Prioritas sistem, nilai bisa 0 – 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2851,11 +2919,11 @@ msgstr ""
 "Menyatakan banyaknya port minimum yang mesti aktif sebelum menegaskan "
 "carrier dalam antar muka induk, nilai bisa 1 – 255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Ini memilih kebijakan bagaimana agregator akan dipilih."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2863,185 +2931,181 @@ msgstr ""
 "Daftar tipe fragmen (string) yang mesti dipakai untuk komputasi hash paket "
 "Tx."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Ruas untuk hash transmisi"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "Dalam persepuluhan detik. Selang waktu periodik antara penyeimbangan ulang."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Nama dari penyeimbang Tx aktif. Penyeimbangan Tx aktif dinonaktifkan secara "
 "baku."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Selang waktu penyeim_bangan transmisi"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Penyeimbang _transmisi"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Pelari"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "Antarmuka i_nduk"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "_Nama antarmuka VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Alamat MA_C Klon"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "_Id VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Flag"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "U_rutkan ulang header"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "Pengikatan _longgar"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Nama perangkat + nomor"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + nomor"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "K_eamanan"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klien"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "_Daya transmisi"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Laju"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "K_anal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Ban_d"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Tidak ada otorisasi polkit untuk melaksanakan aksi"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Metoda Otentikasi yang Diijinkan"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versi 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3050,98 +3114,94 @@ msgstr ""
 "otentikasi. Bila koneksi gagal, cobalah mematikan dukungan untuk beberapa "
 "metoda."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "Tunnel IP"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Tidak ada jenis layanan VPN."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "Pengaya VPN gagal mengimpor koneksi VPN dengan benar: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Pilih berkas untuk diimpor"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Buka"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Perangkat Keras"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Impor suatu konfigurasi VPN yang tersimpan…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3149,84 +3209,82 @@ msgstr ""
 "Dialog penyunting koneksi tidak dapat diinisialisasi karena galat yang tak "
 "dikenal."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Tak bisa membuat koneksi baru"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Penghapusan koneksi gagal"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Anda yakin ingin menghapus koneksi %s?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "Ko_neksi Baru"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Awalan"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Menyunting %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Sunting koneksi tak bernama"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Kurang nama koneksi"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Menginisialisasi penyunting…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Koneksi tak bisa diubah"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Pengaturan tak valid %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3234,34 +3292,34 @@ msgstr ""
 "Penyunting koneksi tak dapat menemukan beberapa sumber daya yang diperlukan "
 "(berkas .ui tak ditemukan)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Simpan perubahan yang dibuat atas koneksi ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Lalukan otentikasi untuk menyimpan koneksi ini bagi semua pengguna dari "
 "mesin ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Tak bisa membuat koneksi"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Tak bisa menyunting koneksi"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Galat tak dikenal saat membuat dialog penyunting koneksi."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3269,19 +3327,19 @@ msgstr ""
 "Peringatan: koneksi memuat beberapa properti yang tidak didukung oleh "
 "penyunting. Mereka akan dibersikan ketika disimpan."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Galat menginisialisasi penyunting"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Penambahan koneksi gagal"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Perbaiki"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3289,23 +3347,23 @@ msgstr ""
 "Label keamanan bisa mencegah beberapa berkas dipakai dengan otentikasi "
 "sertifikat."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "_Nama koneksi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Ekspor…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Label Ulang Berkas"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Label ulang"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3313,201 +3371,204 @@ msgstr ""
 "Berkas-berkas berikut tidak dilabeli untuk dipakai dengan otentikasi "
 "sertifikat. Apakah Anda hendak menyetel label?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Label ulang"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Nama berkas"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "tak pernah"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "kini"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d menit lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d jam lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d hari lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d bulan lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d tahun lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Koneksi tak bisa dihapus"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Pilih koneksi untuk disunting"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Pilih koneksi untuk dihapus"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nama"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Terakhir Dipakai"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Sunting koneksi terpilih"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Lakukan otentikasi untuk menyunting koneksi yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Hapus koneksi yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Lakukan otentikasi untuk menghapus koneksi yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Jenis koneksi tidak dikenal"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Tidak tahu bagaimana mengimpor koneksi \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Galat saat mengimpor koneksi"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Galat saat membuat koneksi"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Jenis koneksi tak bisa diubah"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Tak ada plugin VPN yang terpasang."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Tidak tahu bagaimana membuat koneksi \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Galat saat menyunting koneksi"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Tidak menemukan koneksi dengan UUID \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Koneksi Jaringan"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Tambah koneksi baru"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Keamanan 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Tak bisa memuat antar muka pengguna Keamanan 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Gunakan keamanan 802.1_X untuk koneksi ini"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Alamat MAC dari perangkat Bluetooth. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Tak dapat memuat antar muka pengguna Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "perangkat Bluetooth tak valid (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Koneksi Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Tipe Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Pilih tipe profil koneksi Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Jaringan Area _Personal"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Jaringan _Dial-Up"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Tak bisa memuat antar muka pengguna bond."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primer"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Koneksi Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Tak bisa memuat antar muka pengguna bridge."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Koneksi bridge %d"
@@ -3515,36 +3576,36 @@ msgstr "Koneksi bridge %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port Bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Tak bisa memuat antar muka pengguna bridge."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Tak dapat memuat antar muka pengguna DCB."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Tak dapat memuat antar muka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "antarmuka induk yang hilang"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Koneksi DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3554,41 +3615,40 @@ msgstr ""
 "nama antarmukanya atau MAC permanen atau keduanya. Contoh: \"em1\", "
 "\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "diabaikan"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Tak bisa memuat antar muka pengguna ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Perangkat ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "MAC yang diklon"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "sandi Wake-on-LAN"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Koneksi ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:806
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Baku"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3598,11 +3658,11 @@ msgstr ""
 "memilihnya menyebabkan penggunaan set zona baku dalam firewall. Hanya dapat "
 "dipakai bila firewalld aktif."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Tak bisa memuat antar muka pengguna Umum."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3614,166 +3674,158 @@ 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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Tak bisa memuat antar muka pengguna InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "perangkat infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Koneksi InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Tidak bisa memuat antar muka pengguna tunnel IP."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Koneksi tunnel IP %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Otomatis (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Otomatis (VPN) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Otomatis, hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Otomatis (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Otomatis (PPPoE) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Otomatis (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Otomatis (DHCP) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Hanya Link-Lokal"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Server _DNS tambahan"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Ranah p_encarian tambahan"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Menyunting rute IPv4 untuk %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Tatanan IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Tak bisa memuat antar muka pengguna IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Alamat IPv4 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Netmask alamat IPv4 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Gateway IPv4 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Server DNS IPv4 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Otomatis, hanya DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Menyunting rute IPv6 untuk %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Tatanan IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Tak bisa memuat antar muka pengguna IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Alamat IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefiks IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Gateway IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Server DNS IPv6 \"%s\" tak valid"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Tidak dapat memuat antarmuka pengguna MACsec."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "Koneksi MACSEC %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Slave duplikat"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Slave \"%s\" dan \"%s\" keduanya berlaku bagi perangkat \"%s\""
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3782,25 +3834,25 @@ msgstr ""
 "Slave \"%s\" dan \"%s\" berlaku bagi port virtual yang berbeda (\"%s\" dan "
 "\"%s\") dari perangkat fisik yang sama."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Tak bisa memuat antar muka pengguna data seluler."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Jenis koneksi data seluler tidak didukung."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pilih Tipe Operator Data Seluler"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3808,85 +3860,85 @@ msgstr ""
 "Pilih teknologi yang digunakan oleh operator seluler Anda. Bila Anda tak "
 "yakin, tanyakan ke operator Anda."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Operator saya memakai teknologi berbasis _GSM (mis. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Operator saya memakai teknologi berbasis C_DMA (mis. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "tak ada"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Menyunting metoda otentikasi PPP bagi %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Pengaturan PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Tak bisa memuat antar muka pengguna PPP."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Tak bisa memuat antar muka pengguna proksi."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Galat: berkas tak memuat konfigurasi JSON yang valid"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Tak dapat memuat antar muka pengguna tim."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Koneksi tim %d"
@@ -3894,68 +3946,67 @@ msgstr "Koneksi tim %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port Tim"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Tidak dapat memuat antarmuka pengguna port tim."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Koneksi baru…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Tak bisa memuat antar muka pengguna VLAN."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan induk"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Koneksi VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Tak bisa menemukan plugin VPN penyunting bagi \"%s\" (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "kegagalan yang tak dikenal"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Tak bisa memuat antar muka pengguna VPN."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Tak bisa menemukan plugin VPN bagi \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Koneksi VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Pilih Jenis Koneksi VPN"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3965,7 +4016,7 @@ msgstr ""
 "VPN yang ingin Anda buat tidak muncul pada daftar, mungkin Anda belum "
 "memasang plugin VPN yang tepat."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -3973,7 +4024,7 @@ msgstr ""
 "Opsi ini mengunci koneksi ini ke access point (AP) Wi-Fi yang dinyatakan "
 "oleh BSSID yang dimasukkan disini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -3983,95 +4034,93 @@ msgstr ""
 "nama antarmukanya atau MAC permanen atau keduanya. Contoh: \"wlan0\", "
 "\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Tak bisa memuat antar muka pengguna Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Perangkat Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Koneksi Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Heksa atau ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa-kunci WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP Dinamik (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Tak bisa memuat antar muka pengguna keamanan Wi-Fi; kurang pengaturan Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Kemananan Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Tak bisa memuat antar muka pengguna keamanan Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "kurang SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Keamanan tidak kompatibel dengan mode Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Berkas bernama \"%s\" sudah ada."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Timpa"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Apakah Anda ingin menggantikan %s dengan koneksi VPN yang sedang Anda simpan?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Tidak dapat mengekspor koneksi VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4082,116 +4131,103 @@ msgstr ""
 "\n"
 "Galat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Ekspor koneksi VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "B_uka kunci"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Otomatis membuka kunci perangkat ini"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informasi Koneksi"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Koneksi Jaringan Aktif"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Tidak ada sertifikat yang ditata"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Tidak ada kunci yang ditata"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pilih sebuah kunci bagi Sertifikat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "_Kunci privat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "Kata _sandi kunci %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Pilih Sertifikat %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "_Sertifikat %s"
 
-#: ../src/libnma/nma-mobile-wizard.c:281
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Negaraku tak terdaftar"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Tak terdaftar"
 
-#: ../src/libnma/nma-mobile-wizard.c:465
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Tipe langgananku tak terdaftar…"
 
-#: ../src/libnma/nma-mobile-wizard.c:626
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Operator"
 
-#: ../src/libnma/nma-mobile-wizard.c:908
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Negara atau wilayah"
-
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Negaraku tak terdaftar"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Perangkat GSM terpasang"
 
-#: ../src/libnma/nma-mobile-wizard.c:1002
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Perangkat CDMA terpasang"
 
-#: ../src/libnma/nma-mobile-wizard.c:1208
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Sebarang perangkat"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Koneksi Data Seluler Baru"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4199,90 +4235,71 @@ msgstr ""
 "Asisten ini membantu Anda menyiapkan dengan mudah koneksi data seluler ke "
 "jaringan 3G."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Anda akan memerlukan informasi berikut:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Nama operator seluler Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Nama tipe langganan seluler Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(dalam beberapa kasus) APN (Access Point Name) tipe langganan data seluler "
 "Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Buat koneksi bagi perangka_t data seluler ini:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Siapkan Koneksi Data Seluler"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Daftar Negara atau Wilayah:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Negara atau wilayah"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Pilih Negara atau Wilayah Operator Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Pi_lih operator Anda dari daftar:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Operator saya memakai teknologi GSM (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Operator saya memakai teknologi CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Operator:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pilih Operator Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Pilih jeni_s langganan Anda:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Access Point Name) yang dipilih:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4295,37 +4312,31 @@ msgstr ""
 "Bila Anda tidak yakin tentang tipe langganan Anda silakan bertanya ke "
 "operator tentang APN Anda."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Pilih Jenis Langganan Anda"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Koneksi data seluler Anda ditata dengan tatanan berikut:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Perangkat Anda:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Operator Anda:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jenis Langganan:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4338,184 +4349,175 @@ msgstr ""
 "jaringan, periksa ulang tatanan Anda. Untuk mengubah tatanan koneksi data "
 "seluler Anda, pilih \"Koneksi Jaringan\" dari menu Sistem → Preferensi."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Konfirmasikan Tatanan Data Seluler"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Nihil)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Kunci dalam %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Sertifikat dalam %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Tidak dikenal)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Pilih"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Pilih dari berkas…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Pilih Sertifikat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "Kata _sandi sertifikat %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Galat saat log masuk: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Galat saat membuka suatu sesi: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "B_uka kunci token"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Diterbitkan Oleh"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Masukkan PIN %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Log Masuk"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Ingat PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Simpan sandi hanya bagi pengguna ini"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Simpan sandi bagi semua pengguna"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Tanyakan sandi ini setiap kali"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Sandi tidak diperlukan"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "_Tampilkan sandi"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Sandi _Tersier:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "Sandi _Sekunder:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Sandi:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Klik untuk menyambung"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Mungkin kurang sandi atau koneksi tidak valid. Pada kasus terakhir, Anda "
-"mesti menyunting koneksi dengan nm-connection-editor terlebih dahulu"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Baru…"
 
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tak ada"
 
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinamik (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Buat"
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Sandi atau kunci enkripsi diperlukan untuk mengakses jaringan Wi-Fi \"%s\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Otentikasi Jaringan Wi-Fi Diperlukan"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Buat Jaringan Wi-Fi Baru"
 
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Jaringan Wi-Fi baru"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Masukkan sebuah nama untuk jaringan Wi-Fi yang ingin Anda buat."
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambungkan ke Jaringan Wi-Fi Tersembunyi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Jaringan Wi-Fi tersembunyi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4523,35 +4525,51 @@ msgstr ""
 "Masukkan nama dan rincian keamanan dari jaringan Wi-Fi tersembunyi yang "
 "ingin Anda sambungkan."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Kemananan _Wi-Fi"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "K_oneksi"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "_Adaptor Wi-Fi"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Operator:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Daftar Negara atau Wilayah:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Negara atau wilayah"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kabel"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Mesh OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4561,33 +4579,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%2$s %1$s"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Mungkin kurang sandi atau koneksi tidak valid. Pada kasus terakhir, Anda "
+"mesti menyunting koneksi dengan nm-connection-editor terlebih dahulu"
+
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Kemananan _Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Nama jaringan:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "K_oneksi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptor Wi-Fi:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4595,7 +4621,7 @@ msgstr ""
 "Program ini adalah komponen dari NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4603,319 +4629,335 @@ msgstr ""
 "Ini tidak ditujukan bagi interaksi baris perintah, sebagai gantinya, "
 "jalankan ini di lingkungan desktop GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "tak diaktifkan"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "tak terdaftar"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Jaringan rumah (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Jaringan rumah"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "sedang mencari"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrasi ditolak"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Jaringan roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Jaringan roaming"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Kode PIN bagi kartu SIM \"%s\" pada \"%s\""
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Perlu kode PIN"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Kode PIN dibutuhkan untuk perangkat data seluler"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Koneksi data seluler \"%s\" aktif: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Koneksi %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Sertifikat PEM  (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Kunci privat DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "galat tak terdefinisi dalam keamanan 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "tidak ada sertifikat CA yang dipilih"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "berkas sertifikat CA yang dipilih tidak ada"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "kurang berkas PAC EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Pilih suatu berkas PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Berkas PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Semua berkas"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Terotentikasi"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Keduanya"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Identitas anoni_m"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "_Berkas PAC"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "Otent_ikasi dalam"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Otomatis ijinkan pro_visi PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "kurang nama pengguna EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "kurang sandi EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versi 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Tak pe_rlu ada sertifikat CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "_Versi PEAP"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Akhiran nama sertifikat server."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domain"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "kurang nama pengguna EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "kurang sandi EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Frasa-kunci WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Tampilkan sandi"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "kurang identitas EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "tidak ada sertifikat pengguna yang dipilih"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "berkas sertifikat pengguna yang dipilih tidak ada"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "tidak ada kunci yang dipilih"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "berkas kunci yang dipilih tidak ada"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "I_dentitas"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (tanpa EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Galat tak diketahui saat memvalidasi keamanan 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "O_tentikasi"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "kurang nama pengguna leap"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "kurang sandi leap"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "kurang kunci wep"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "kunci wep tak valid: kunci dengan panjang %zu mesti hanya memuat dijit heksa"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4923,7 +4965,7 @@ msgstr ""
 "kunci wep tak valid: kunci dengan panjang %zu mesti hanya memuat karakter "
 "ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4932,40 +4974,40 @@ msgstr ""
 "kunci wep tak valid: panjang kunci %zu salah. Suatu kunci mesti memiliki "
 "panjang 5/13 (ascii) atau 10/26 (heksa)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "wep-key tak valid: frasa sandi tak boleh kosong"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "kunci wep tak valid: frasa sandi mesti lebih pendek daripada 64 karakter"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem Terbuka"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunci Bersama"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Bawaan)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Kunci"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Tampilkan _kunci"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "Inde_ks WEP"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4974,16 +5016,25 @@ msgstr ""
 "wpa-psk tak valid: panjang kunci %zu tak valid. Mesti antara [8,63] byte "
 "atau 64 heksa dijit"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk tak valid: tak bisa menginterpretasi kunci dengan 64 byte sebagai "
 "heksa"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Jenis"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (bawaan)"
+
+#~ msgid "Ignored"
+#~ msgstr "Diabaikan"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Koneksi Jaringan Aktif"
+
 #~ msgid "Cannot import VPN connection"
 #~ msgstr "Tak dapat mengimpor koneksi VPN"
 
diff --git a/po/is.po b/po/is.po
index dcbe2203..452f5e0b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2018-03-19 00:48+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-03-19 15:25+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
@@ -18,48 +18,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Netkerfi"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Sýsla með nettengingar"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Nettengingar"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Virkar nettengingar"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Breyta og halda utan um nettenginguna"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Afvirkja tilkynningar þegar tengst er við netið"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er netkerfum."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Afvirkja tilkynningar þegar aftengst er við netið"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar þegar aftengst er "
 "netkerfum."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Afvirkja VPN tilkynningar"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -67,51 +76,52 @@ msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar þegar tengst er eða "
 "aftengst VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Útiloka tilkynningar um tiltæk netkerfi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar þegar Wi-Fi netkerfi eru "
 "fáanleg"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stimpill"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Notað til að ákvarða hvort stillingar skuli yfirfærðar í nýja útgáfu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Gera óvirkt að búa til ný Wi-Fi-net"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Settu þetta sem satt til að gera óvirka gerð beintengdra (ad-hoc) neta þegar "
 "þessi forritlingur er í notkun."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Birta tákn fyrir forritið á tilkynningasvæði"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Settu þetta sem ÓSATT til að koma í veg fyrir að tákn fyrir forritið birtist "
 "á tilkynningasvæði."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Hunsa CA skilríki"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -119,7 +129,7 @@ msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í EAP-"
 "auðkenningu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -127,15 +137,15 @@ msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í "
 "fasa 2 í EAP-auðkenningu."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager netstýring"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager tengingaritill"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -143,7 +153,7 @@ msgstr ""
 "NetworkManager er kerfisþjónusta sem gerir kleift að sýsla með og stilla "
 "nettengingar og nettæki."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -151,118 +161,118 @@ msgstr ""
 "Forritið nm-connection-editor virkar með NetworkManager við að búa til ný "
 "tengisnið og breyta þeim sem þegar eru fyrir hendi í NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Þróunarteymi NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X auðkenning"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Hætta við"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Tengjast"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Heiti _netkerfis:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "beintengt (ad-hoc)"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "öruggt."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Mistókst að bæta við/virkja tengingu"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Tenging brást"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Tókst ekki að tengjast við tæki"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Aftenging  mistókst"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Virkjun tengingar mistókst"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Ekki sýna þessi skilaboð aftur"
 
-#: ../src/applet.c:899
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +282,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' aftengdist þar sem nettengingin var trufluð."
 
-#: ../src/applet.c:901
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +292,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem nettengingin var trufluð."
 
-#: ../src/applet.c:903
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +301,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN þjónustan stöðvaði óvænt."
 
-#: ../src/applet.c:905
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +311,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan skilaði röngum stillingum."
 
-#: ../src/applet.c:907
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +320,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem tilraun til tengingar rann út á tíma."
 
-#: ../src/applet.c:909
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -319,7 +329,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan fór ekki í gang á réttum tíma."
 
-#: ../src/applet.c:911
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -328,7 +338,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan fór ekki í gang."
 
-#: ../src/applet.c:913
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +348,7 @@ msgstr ""
 "VPN-tengingin '%s' brást þar sem ekki fengust nein gild VPN-leyndarauðkenni "
 "(secrets)."
 
-#: ../src/applet.c:915
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +358,7 @@ msgstr ""
 "VPN-tengingin '%s' brást þar sem VPN-leyndarauðkenni (secrets) reyndust "
 "ógild."
 
-#: ../src/applet.c:920
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -357,7 +367,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást."
 
-#: ../src/applet.c:947
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -368,19 +378,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:949
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-tengingu hefur verið komið á.\n"
 
-#: ../src/applet.c:951
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Innskráningarskilaboð VPN-nets"
 
-#: ../src/applet.c:959 ../src/applet.c:999
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-nettenging brást"
 
-#: ../src/applet.c:1003
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -393,7 +403,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -406,565 +416,572 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "tæki ekki tilbúið (grunnhugbúnað/firmware vantar)"
 
-#: ../src/applet.c:1297
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "tæki ekki tilbúið"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "aftengdist"
 
-#: ../src/applet.c:1323
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Aftengja"
 
-#: ../src/applet.c:1337
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "tæki er í ekki stýringu (managed)"
 
-#: ../src/applet.c:1410
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Engin net tiltæk"
 
-#: ../src/applet.c:1464
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-nettengingar"
 
-#: ../src/applet.c:1508
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "Stilla V_PN-net..."
 
-#: ../src/applet.c:1511
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Bæt_a við VPN-nettengingu…"
 
-#: ../src/applet.c:1617
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager er ekki í gangi..."
 
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Netvinnsla óvirk"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Leyfa _nettengingu"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Virkja _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Virkja ferða_breiðband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1862
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Virkja tilk_ynningar"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1874
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Upplýsingar um tengingu"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Breyta tengingum..."
 
-#: ../src/applet.c:1896
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Um hugbúnaðinn"
 
-#: ../src/applet.c:2207
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Þú ert núna tengdur við “%s”."
 
-#: ../src/applet.c:2247
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Ótengt"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Nettengingin hefur verið aftengd."
 
-#: ../src/applet.c:2550
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Undirbý að tengjast “%s”…"
 
-#: ../src/applet.c:2553
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Notandinn þarf að samþykkja tengingu við “%s”…"
 
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Sæki um netkerfisvistfang fyrir “%s”…"
 
-#: ../src/applet.c:2559
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Nettengingin “%s” er virk"
 
-#: ../src/applet.c:2632
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Ræsi VPN-nettenginguna “%s”…"
 
-#: ../src/applet.c:2635
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Notandinn þarf að samþykkja VPN-nettenginguna “%s”…"
 
-#: ../src/applet.c:2638
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Bið um VPN-vistfang fyrir “%s”…"
 
-#: ../src/applet.c:2641
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-nettenginging er virk"
 
-#: ../src/applet.c:2691
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Engin nettenging"
 
-#: ../src/applet.c:3292
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager forrit"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Rangur PUK-kóði; hafðu samband við þjónustuveituna þína."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Rangt PIN-númer; hafðu samband við þjónustuveituna þína."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Sendi aflæsikóða…"
 
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Ferðabreiðband (%s)"
 
-#: ../src/applet-device-broadband.c:739
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Ferðabreiðband"
 
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tiltækt"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:805
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Ný ferðabreiðbandstenging…"
 
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Tengingu hefur verið komið á"
 
-#: ../src/applet-device-broadband.c:820
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Þú hefur tengst við ferðabreiðbandsnet."
 
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Ferðabreiðbandsnet."
 
-#: ../src/applet-device-broadband.c:961
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Þú ert núna tengdur við heimanetið."
 
-#: ../src/applet-device-broadband.c:967
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Þú ert núna tengdur við reikinet."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Þú hefur tengst við ferðabreiðbandsnet."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Undirbý ferðabreiðbandstenginguna “%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Stilli ferðabreiðbandstenginguna “%s”…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Auðkenningar notanda er krafist fyrir ferðabreiðbandstenginguna “%s”…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Ferðabreiðbandstenging '%s' virk"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Sjálfvirkt Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet netkerfi (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet netkerfi (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet netkerfi"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet netkerfi"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Þú ert núna tengdur við Ethernet íðnetið."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Undirbý ethernet-tengingu “%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Stilli ethernet-tengingu “%s”…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Auðkenningar notanda er krafist fyrir ethernet-tenginguna“%s”…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Sæki um ethernet-vistfang fyrir “%s”…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet-tengingin '%s' er virk"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL auðkenning"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "Í _lagi"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Tengjast við falið Wi-Fi netkerfi…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Búa til nýtt Wi-Fi netkerfi…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ekkert)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Mistókst að bæta við tengingu"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Ekki nægar heimildir."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi netkerfi (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi netkerfi (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi netkerfi"
 msgstr[1] "Wi-Fi Netkerfi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi er óvirkt"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi er gert óvirkt með vélbúnaðarrofa"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Fleiri net"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi netkerfi tiltæk"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Notaðu netkerfavalmyndina til að tengjast við þráðlaus Wi-Fi netkerfi"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Þú ert núna tengdur við Wi-Fi netið “%s”."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Undirbý Wi-Fi nettenginguna “%s”…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Stilli Wi-Fi nettenginguna “%s”…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Auðkenningar notanda er krafist fyrir Wi-Fi netkerfið “%s”…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Sæki um Wi-Fi vistfang fyrir “%s”…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi nettengingin '%s' virk: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi nettengingin '%s' virk"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Mistókst að virkja tengingu"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Villa kom upp við að birta upplýsingar um tenginguna:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Breytilegt (dynamic) WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Fleiri vistföng"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (sjálfgefið)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/sek"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Óþekkt"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP vistfang"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Útvörpunarvistfang"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Undirnetssía"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Aðal"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Auka-lykilorð"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Almennt"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Tengi"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Vistfang vélbúnaðar"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drif"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Hraði"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Öryggi:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Sjálfgefin tengileið (route)"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Hunsað"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Tengipunktur (hotspot)"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Lykilorð:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tegund VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-netgátt (gateway)"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-notandanafn"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN tilkynningaborði (banner)"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Grunntenging"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Óþekkt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Fann engar virkar tengingar!"
 
-#: ../src/applet-dialogs.c:1007
-#| msgid ""
-#| "Copyright © 2004-2014 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -974,20 +991,20 @@ msgstr ""
 "Höfundarréttur © 2005-2008 Novell, Inc.\n"
 "og margir aðrir í frjálsa hugbúnaðarsamfélaginu"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Forrit sem sér um nettæki og að tengjast við netið."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Heimasíða NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Sveinn í Felli, sv1@fellsnet.is"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -995,33 +1012,33 @@ msgstr ""
 "NetworkManager forritlingurinn gat ekki fundið nauðsynleg tilföng (.ui-"
 "skráin fannst ekki)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Vantar tilföng"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Lykilorð fyrir þráðlaust breiðbandsnet"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Það er nauðsynlegt að gefa upp lykilorð til að tengjast við '%s‘."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Krafist er PIN-númers til að aflæsa SIM-korti"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Krafist er PIN-númers til að aflæsa SIM-korti"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1031,25 +1048,25 @@ msgstr ""
 "verður að nota það."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-númer:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Sýna PIN-númer"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Krafist er PUK-kóða til að aflæsa SIM-korti"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Krafist er PUK-kóða til að aflæsa SIM-korti"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1059,43 +1076,41 @@ msgstr ""
 "að nota það."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kóði:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nýtt PIN-númer:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Sláðu aftur inn nýja PIN-númerið:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Sýna PIN/PUK-númer"
 
-#: ../src/applet-vpn-request.c:201
-#| msgid "Connection Information"
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Tenging er ekki með stillingar fyrir VPN"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Mistókst að skrifa tengingu í VPN-viðmót: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Mistókst að skrifa tengingu í VPN-viðmót: skrifun ekki kláruð"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1103,41 +1118,41 @@ msgstr ""
 "IP-vistföng auðkenna tölvuna þína á netkerfinu.  Smelltu á \"Bæta við\" "
 "hnappinn til að bæta við IP-vistfangi."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Bæta við"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Eyða"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Hunsa sjálfvirkt úthlutaðar beiningar"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "N_ota þessa tengingu einungis fyrir efni af sínu eigin neti"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1145,15 +1160,15 @@ msgstr ""
 "Ef þetta er virkt, verður þessi tenging aldrei notuð sem sjálfgefin "
 "nettenging."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "_Búa til…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Veldu tegund tengingar"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1165,111 +1180,113 @@ msgstr ""
 "Ef þú vilt búa til VPN-tengingu og slík tenging er ekki í listanum, er "
 "hugsanlegt að þú sért ekki með rétt VPN-viðbótarforrit uppsett."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "Tæ_ki"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Hringbeining (Round-Robin)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Virk öryggisafritun"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Útvörpun"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Aðlaganleg jöfnun sendihleðslu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Aðlaganleg hleðslujöfnun"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (mælt er með þessu)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "Bun_dnar tengingar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-#| msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "_Hamur"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Breyta"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-#| msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Tíðni _vöktunar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "msek"
 
-#: ../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:16
-#| msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "_Heiti viðmóts"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-#| msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "Vö_ktun tengis"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-#| msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "ARP ú_ttök"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
-"IP-vistfang, eða kommu-aðgreindur listi IP-vistfanga, sem leita skal að þegar "
-"skoðuð er staða tengils."
+"IP-vistfang, eða kommu-aðgreindur listi IP-vistfanga, sem leita skal að "
+"þegar skoðuð er staða tengils."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Töf virkra tengla (_up)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Töf óvirkra tengla (_down)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-#| msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Aðal"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1277,116 +1294,111 @@ msgstr ""
 "Heiti viðmótsins á aðaltækinu. Ef þetta er stillt, verður þetta tæki alltaf "
 "virkur þræll þegar það er tiltækt."
 
-#: ../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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bæti"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-#| msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "_Kostnaður slóðar"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#| msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Forgangur"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#| msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "_Hárnálarhamur (reflective relay)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "_Brúaðar tengingar"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Tö_f áframbeiningar"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-#| msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "\"_Halló\"-tími"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "sek"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Virkja I_GMP hlustun"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Virkja _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
-#| msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "Há_marksaldur"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
-#| msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "Öldrun_artími"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1394,504 +1406,552 @@ msgid ""
 "frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "sjálfvirkt"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "sjálfgefið"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "óskilgreind villa"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stöðugt"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC vistfang"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "HW vistfang"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "ógilt %s fyrir %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "ógilt %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "ógilt viðmótsheiti fyrir %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "ógilt viðmótsheiti (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "ógilt vistfang vélbúnaðar"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "ógilt %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "tæki"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "ógilt %s (%s) "
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Mistókst að uppfæra leyndarauðkenni tengingar vegna óþekktrar villu."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Nota _gagnaverabrúun (data center bridging - DCB) fyrir þessa tengingu"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Flæðistýring"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Eiginleiki"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Virkja"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Auglýsa"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Móttækilegt"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Forgangur"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Valkostir…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Forgangshópar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric tengslanet"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Forgangsmiðuð flæðistýring"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-#| msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Flokkur umferðar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Ströng bandbreidd"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Forgangur bandbreiddar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Hópur bandbreiddar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-#| msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Hópauðkenni"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-#| msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "Notan_danafn"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#| msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "Þjónu_sta"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Sýna lykilorð"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-#| msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "Lykil_orð"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
-#| msgid "Interface:"
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "PPP _viðmót"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Aðalviðmót"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr ""
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Aðalviðmót"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Sjálfvirkt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/sek"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/sek"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/sek"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/sek"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Hunsa"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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:191
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Handvirkt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-#| msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Gátt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-#| msgid "_Device:"
-msgid "_Device"
-msgstr "Tæ_ki"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-#| msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "K_lónað MAC vistfang"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-#| msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Vakning af staðarneti (Wake on LAN)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Sjál_fgefið"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Hunsa"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "Útvör_pun"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-#| msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Lykilorð fyrir vakningu af staðarneti"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Lykilorð fyrir vakningu af staðarneti (Ethernet MAC). Einungis gilt fyrir "
 "magic-pakka."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Hraði"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Tvíhliða_hamur"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Tengjast sjálfkrafa við _VPN þegar verið er að nota þessa tengingu"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ekkert"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "_Allir notendur hafa leyfi til að tengjast þessu neti"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Tengjast þessu neti sjálfkrafa þegar það er tiltækt"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Tengjast sjálfkrafa við _VPN þegar verið er að nota þessa tengingu"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr "Svæði í _eldvegg"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation"
-msgstr "_Upplýsingar um tengingu"
+msgid "_Metered connection"
+msgstr "Hópaðar _tengingar"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Hunsa sjálfvirkt úthlutaðar beiningar"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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:"
-msgid "Firewall _zone"
-msgstr "Svæði í _eldvegg"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1900,7 +1960,7 @@ msgstr ""
 "hnappinn til að bæta við föstu IP-vistfangi sem stillt verður til viðbótar "
 "við þau sjálfvirku."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1908,136 +1968,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Föst vistföng til viðbótar"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Vistföng"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Vistfang (valfrjálst)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Tengt"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-#| msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "F_lutningshamur"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Heiti tækis"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Yfirtæki"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Hamur"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Staðvært IP-vistfang"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Fjartengt IP-vistfang"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Sjálfkrafa með handvirkum DNS stillingum"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Staðvær tengi (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:188
-#: ../src/connection-editor/page-ip6.c:211
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Samnýtt með öðrum tölvum"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#| msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Aðferð"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2045,28 +2102,23 @@ msgstr ""
 "Lén sem notuð eru til að leysa vélaheiti. Notaðu kommur til að aðgreina "
 "vistföng margra nafnaþjóna."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#| msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "Auðkenni D_HCP biðlara"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-#| msgid "S_earch domains:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "L_eitarlén"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-#| msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "DNS nafna_miðlarar"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2074,11 +2126,11 @@ msgstr ""
 "IP-vistföng lénanafnaþjóna sem notaðir eru til að leysa vélaheiti. Notaðu "
 "kommur til að aðgreina vistföng margra nafnaþjóna."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Krefjast IPv_4-vistfanga til að klára þessa tengingu"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2086,35 +2138,35 @@ msgstr ""
 "Þegar tengst er netkerfum með IPv6-getu, er gert kleift að ljúka tengingu "
 "þótt IPv4 uppsetning mistakist en IPv6 uppsetning tekst."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Beiningar…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Óvirkt"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Virkt (velja frekar almennt vistfang)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Virkt (velja frekar bráðabirgðavistfang)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 #, fuzzy
 msgid "Stable privacy"
 msgstr "Virkja"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2124,19 +2176,19 @@ msgstr ""
 "kommur til að aðgreina vistföng margra nafnaþjóna. Vistföng staðværra tengja "
 "(link-local) verða afrituð sjálfvirkt yfir í viðmót tengingar."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 _gagnaleyndarviðbætur"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Krefjast IPv_6-vistfanga til að klára þessa tengingu"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2144,1033 +2196,1000 @@ msgstr ""
 "Þegar tengst er netkerfum með IPv4-getu, er gert kleift að ljúka tengingu "
 "þótt IPv6 uppsetning mistakist en IPv4 uppsetning tekst."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Prófa"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
-#| msgid "Metric"
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Strangt"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Lyklar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Viðföng"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Fullgilding"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI-gátt"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Dulrita"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Einfalt"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-#| msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Nú_mer"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Nánar"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#| msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-#| msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Auðk_enni netkerfis"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Breyta…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-#| msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Leyfa _reiki ef heimanet er ekki í boði"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Sýna lykilorð"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Auðkenning"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-#| msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Leyfðar aðferðir"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Breyta _aðferðum..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Þjöppun"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Nota _jafningjadulkóðun (Point-to-Point Encryption - MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Krefjast 128-bita dulkóðunar"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Nota _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Leyfa þjöppun  _BSD gagna"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Leyfa þjöppun _Deflate gagna"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Nota þjö_ppun á TCP-hausa"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Hlustun (echo)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Senda PPP _echo pakka"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ekkert"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Einungis fyrir vafra"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC-slóð"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "PAC-skrifta"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Flytja skriftu inn úr skrá…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Aðferð"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Nánar…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Staða ethernet-gáttar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Forgangur gáttar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "Forgangur _LACP gáttar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "Ly_kill LACP gáttar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 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:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 #, fuzzy
 msgid "_Source host"
 msgstr "ARP ú_ttök:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
 msgid "_Target host"
 msgstr "ARP ú_ttök:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Flytja inn hó_punaruppsetningu úr skrá..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Breyta _JSON-uppsetningu"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Mesti forgangur"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Mesti forgangur (stöðugt)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Bandbreidd"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Mesti fjöldi gátta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Forgangur gáttar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet nettæki"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-#| msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Hópaðar _tengingar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Einhver L3-samskiptamáti"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Einhver L4-samskiptamáti"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "Vistfang vél_búnaðar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
 msgid "_Hardware address policy"
 msgstr "Vistfang vélbúnaðar:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Forgangur kerfis"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "Lág_mark gátta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
 msgid "Transmission _balancing interval"
 msgstr "Sendist_yrkur:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
 msgid "_Transmission balancer"
 msgstr "Sendist_yrkur:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
 msgid "_Parent interface"
 msgstr "Ethernet nettæki"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "Heiti VLA_N viðmóts"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Klónað M_AC-vistfang"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-#| msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN _ID"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-#| msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Flögg"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "Endu_rraða hausum"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Lausleg binding"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Heiti tækis + tala"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + tala"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-#| msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Öry_ggi"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Biðlari"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Tengipunktur (hotspot)"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Beintengt (ad-hoc)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-#| msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Sendist_yrkur"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "MB/sek"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-#| msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "H_raði"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-#| msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-#| msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Rás"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-#| msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Tíðn_isvið"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-#| msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Ekki heimild frá polkit til að framkvæma þessa aðgerð"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Leyfilegar auðkenningaraðferðir"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol útgáfa 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bundið (bond)"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Hópað (team)"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:233
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Brúun (bridge)"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP-göng"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN-net"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Get ekki tekið á móti VPN-nettengingu"
-
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Skráin '%s' var ekki lesanleg eða að hún inniheldur ekki þekkjanlegar VPN "
-"tengiupplýsingar\n"
-"\n"
-"Villa: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "óþekkt villa"
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Veldu skrá til að flytja inn"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Opna"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Sýndar"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Flytja inn vistaða VPN uppsetningu…"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Ekki var hægt að frumstilla tengingaritilinn vegna óþekktrar villu."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Gat ekki búið til nýja tengingu"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Það tókst ekki að eyða tengingunni"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ertu viss um að þú viljir eyða tengingu %s?"
 
-#: ../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:1118
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-nettengingar"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Vistfang"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Nethula (mask)"
 
-#: ../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:1156
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gátt"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Leiðargæði (metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Forskeyti"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Breyti %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Breyti nafnlausri tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Heiti tengingar vantar"
 
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Frumstilling ritils…"
 
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Ekki er hægt að breyta tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ógild stilling %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3178,51 +3197,51 @@ msgstr ""
 "Tengingaritillinn gat ekki fundið nauðsynleg tilföng (.ui-skráin fannst "
 "ekki)."
 
-#: ../src/connection-editor/nm-connection-editor.c:574
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Vi_sta"
 
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Vista allar breytingar á þessari tengingu."
 
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Auðkenndu þig til að vista þessa tengingu fyrir alla notendur tölvunnar."
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Gat ekki búið til tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Gat ekki breytt tengingunni"
 
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Villa við að búa til glugga tengingaritils."
 
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: src/connection-editor/nm-connection-editor.c:742
 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:755
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Villa í frumstillingu ritils"
 
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Það tókst ekki að bæta við"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Laga"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3231,213 +3250,234 @@ msgstr ""
 "Settu þetta sem satt til að afvirkja tilkynningar varðandi CA-skilríki í EAP-"
 "auðkenningu."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Heiti _tengingar"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Flytja út..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Skráarheiti"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "aldrei"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "núna"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fyrir %d mínútu síðan"
 msgstr[1] "fyrir %d mínútum síðan"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fyrir %d klukkustund síðan"
 msgstr[1] "fyrir %d klukkustundum síðan"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Fyrir %d degi"
 msgstr[1] "Fyrir %d dögum"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Fyrir %d mánuði"
 msgstr[1] "Fyrir %d mánuðum"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Fyrir %d ári"
 msgstr[1] "Fyrir %d árum"
 
-#: ../src/connection-editor/nm-connection-list.c:445
-#| msgid "Connection cannot be modified"
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Ekki er hægt að eyða tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:448
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Veldu tengingu til að breyta"
 
-#: ../src/connection-editor/nm-connection-list.c:450
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Veldu tengingu til að eyða"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nafn"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Síðast notað"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Breyta valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Auðkenndu þig til að breyta valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Eyða valdri tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Auðkenndu þig til að eyða valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Óstudd tengingartegund ferðabreiðbands."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Kann ekki að búa til '%s' tengingar"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Villa við að breyta tengingu"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Villa við að búa til tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Ekki er hægt að breyta tengingu"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Engar VPN-viðbætur eru uppsettar."
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Kann ekki að búa til '%s' tengingar"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Villa við að breyta tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Finn ekki tengingu með UUID '%s'"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Nettengingar"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Bæta við nýrri tengingu"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Öruggt 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti fyrir Öruggt 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Notaðu öruggt 802.1_x fyrir þessa tengingu"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAC-vistfang Bluetooth-tækisins. Dæmi: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Gat ekki hlaðið inn Bluetooth notandaviðmóti."
 
-#: ../src/connection-editor/page-bluetooth.c:173
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ógilt Bluetooth-tæki (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:256
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-tenging %d"
 
-#: ../src/connection-editor/page-bluetooth.c:306
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Gerð af Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:324
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Vinsamlegast veldu gerð Bluetooth tengisniðs."
 
-#: ../src/connection-editor/page-bluetooth.c:329
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Einkanet (_Personal Area Network)"
 
-#: ../src/connection-editor/page-bluetooth.c:334
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Innhringinet (_Dial-Up)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti bindingar."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "aðal"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Binda tenginguna %d"
 
-#: ../src/connection-editor/page-bridge.c:236
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti brúunar."
 
-#: ../src/connection-editor/page-bridge.c:352
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brúa tenginguna %d"
@@ -3445,36 +3485,36 @@ msgstr "Brúa tenginguna %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Gátt brúunar"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti gáttar fyrir brúun."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Gat ekki hlaðið inn DBC notandaviðmóti."
 
-#: ../src/connection-editor/page-dsl.c:203
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Gat ekki hlaðið inn DSL notandaviðmóti."
 
-#: ../src/connection-editor/page-dsl.c:298
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:343
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL tenging %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3484,52 +3524,51 @@ msgstr ""
 "annað hvort með nafni viðmóts eða varanlegu MAC-vistfangi eða bæði. Dæmi: "
 "\"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "hunsað"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Get ekki glaðið upp ethernet notanda viðmóti."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet nettæki"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klónað MAC"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Lykilorð fyrir vakningu af staðarneti"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet tenging %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:807
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Sjálfgefið"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Gat ekki hlaðið inn almennu notandaviðmóti."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3541,171 +3580,159 @@ msgstr ""
 "\"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)\""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Gat ekki hlaðið inn InfiniBand notandaviðmóti."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "InfiniBand-tæki"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-nettenging %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Gat ekki hlaðið inn IPv4 notandaviðmóti."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP-göng (tunnel) tenging %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Sjálfvirkt (VPN-net)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Aðeins sjálfvirk (VPN) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Sjálfvirkt, aðeins vistföng"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Sjálfvirkt (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Aðeins sjálfvirk (PPPoE) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Sjálfvirkt (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Aðeins sjálfvirk (DHCP) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Einungis staðvær tengi (link-local)"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-#| msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Auka DNS nafna_miðlarar"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-#| msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Aukal_eg leitarlén"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Breyti IPv4 beiningum fyrir %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 stillingar"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Gat ekki hlaðið inn IPv4 notandaviðmóti."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 vistfangið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Netmaski \"%s\" IPv4 vistfangs er ógildur"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 netgátt  \"%s\" er ógild"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS nafnaþjónn \"%s\" er ógildur"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Sjálfvirkt, aðeins DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Breyti IPv6 beiningum fyrir %s"
 
-#: ../src/connection-editor/page-ip6.c:1208
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 stillingar"
 
-#: ../src/connection-editor/page-ip6.c:1210
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Gat ekki hlaðið inn IPv6 notandaviðmóti."
 
-#: ../src/connection-editor/page-ip6.c:1302
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 vistfangið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip6.c:1310
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 forskeytið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip6.c:1319
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 netgátt  \"%s\" er ógild"
 
-#: ../src/connection-editor/page-ip6.c:1361
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS nafnaþjónn \"%s\" er ógildur"
 
-#: ../src/connection-editor/page-macsec.c:192
-#| msgid "Could not load WiMAX user interface."
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Gat ekki hlaðið inn MACsec notandaviðmóti."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
-#| msgid "WiMAX connection %d"
 msgid "MACSEC connection %d"
 msgstr "MACSEC tenging %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Afrita þræla"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Þrælarnir '%s' og '%s' eiga báðir við tækið '%s'"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3714,25 +3741,25 @@ msgstr ""
 "Þrælarnir '%s' og '%s' eiga við mismunandi sýndargáttir ('%s' og '%s') á "
 "sama rauntækinu."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s þræll %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti ferðabreiðbands."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Óstudd tengingartegund ferðabreiðbands."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Veldu gerð þjónustuveitu ferðabreiðbands"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3740,84 +3767,84 @@ msgstr ""
 "Veldu hvaða tækni þjónustuveita ferðabreiðbandsins notar. Ef þú ert ekki "
 "viss, ættirðu að spyrja þjónustuaðilann þinn."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Þjónustuveitan mín notar _GSM-tækni (t.d. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Þjónustuveitan mín notar C_DMA-tækni (t.d. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ekkert"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Breyti PPP-auðkenningaraðferðum fyrir %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP stillingar"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Gat ekki hlaðið inn PPP notandaviðmóti."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Milliþjónn"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti milliþjóns."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Villa: skrá inniheldur ekki gilda JSON uppsetningu"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti hópunar."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Hópa tenginguna %d"
@@ -3825,75 +3852,74 @@ msgstr "Hópa tenginguna %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Gátt hópunar"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti gáttar fyrir hópun."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (um \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Ný tenging…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Gat ekki hlaðið inn vlan notandaviðmóti."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN nettenging %d"
 
-#: ../src/connection-editor/page-vpn.c:67
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Fann ekki þjónustu fyrir VPN-viðbætur fyrir '%s'."
 
-#: ../src/connection-editor/page-vpn.c:68
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "óþekkt bilun"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Gat ekki hlaðið inn VPN notandaviðmóti."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:117
 #, fuzzy, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Fann ekki þjónustu fyrir VPN-viðbætur fyrir '%s'."
 
-#: ../src/connection-editor/page-vpn.c:202
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-nettenging %d"
 
-#: ../src/connection-editor/page-vpn.c:208
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Veldu tegund VPN-tengingar"
 
-#: ../src/connection-editor/page-vpn.c:209
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3902,7 +3928,7 @@ msgstr ""
 "Þessi möguleiki læsir þessari tengingu saman við Wi-Fi aðgangspunktinn (AP) "
 "sem tiltekinn er í því BSSID sem sett er inn hér.  Dæmi: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3913,95 +3939,93 @@ msgstr ""
 "annað hvort með nafni viðmóts eða varanlegu MAC-vistfangi eða bæði. Dæmi: "
 "\"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Gat ekki hlaðið inn Wi-Fi notanda viðmóti."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi tæki"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi tenging %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit lykill (Hex eða ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit lykilsetning"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Breytilegt (dynamic) WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 einka"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 fyrirtækja"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Gat ekki hlaðið inn notandaviðmóti fyrir Öruggt Wi-Fi; vantar Wi-Fi "
 "stillingar."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Öruggt Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti fyrir Öruggt Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "vantar SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Öruggt Wi-Fi er ekki samhæft við beintengiham (ad-hoc)"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Skrá með nafni „%s“ er þegar til."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Skipta út"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Viltu skipta %s út fyrir VPN-nettenginguna sem þú ert að vista?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Get ekki flutt út VPN-nettengingu"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4012,118 +4036,105 @@ msgstr ""
 "\n"
 "Villa: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Flytja út VPN-nettengingu..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Aflæsa"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Aflæsa þessu tæki sjálfkrafa"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Upplýsingar um tengingu"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Loka"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Virkar nettengingar"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Veldu lykil fyrir skilríki %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "Einkaly_kill %s:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "Lykil_orð einkalykils %s:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Veldu skilríki %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "_Skilríki %s:"
 
-#: ../src/libnma/nma-mobile-wizard.c:281
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Landið mitt er ekki á listanum"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Óskráð"
 
-#: ../src/libnma/nma-mobile-wizard.c:465
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Áskriftin mín er ekki á listanum…"
 
-#: ../src/libnma/nma-mobile-wizard.c:626
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Þjónustuveita"
 
-#: ../src/libnma/nma-mobile-wizard.c:908
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land eða svæði"
-
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Landið mitt er ekki á listanum"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Uppsett GSM tæki"
 
-#: ../src/libnma/nma-mobile-wizard.c:1002
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Uppsett CDMA tæki"
 
-#: ../src/libnma/nma-mobile-wizard.c:1208
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Eitthvað tæki"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ný ferðabreiðbandstenging"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4131,92 +4142,73 @@ msgstr ""
 "Þessi leiðarvísir hjálpar þér að setja upp ferðabreiðbandstengingu fyrir "
 "farsímakerfi (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Þú þarft á eftirfarandi upplýsingum að halda:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Nafn breiðbandsþjónustuveitunnar þinnar"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Nafn breiðbandsáskriftarinnar þinnar"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(í sumum tilfellum) APN aðgangspunktur áskriftarinnar þinnar (Access Point "
 "Name)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Búa til _tengingu fyrir þetta ferðabreiðbandstæki:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Setja upp ferðabreiðbandstengingu"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Listi yfir land eða svæði:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eða svæði"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Veldu land eða hérað þjónustuveitunnar"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Veldu þjónustuaðila úr _listanum:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
-"Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn upplýsingar "
-"um hann:"
+"Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
+"upplýsingar um hann:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Þjónustuveitan mín notar GSM-tækni (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Þjónustuveitan mín notar CDMA-tækni (xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Þjónustuveita:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Veldu þjónustuveituna"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Veldu áskriftina þína:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Valinn  _APN aðgangspunktur (Access Point Name):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4230,37 +4222,31 @@ msgstr ""
 "Ef þú ert ekki viss um hvaða áskrift þú ert með ættirðu að hafa samband við "
 "þjónustuveituna þína og spyrja um viðeigandi APN aðgangspunkt."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Veldu áskriftina þína"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Ferðabreiðbandstengingin þín er stillt með eftirfarandi breytum:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Tækið þitt:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Þjónustuveitan þín:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Áskriftin þín:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4274,185 +4260,176 @@ msgstr ""
 "breyta stillingum ferðabreiðbandsins, veldu \"Nettengingar\" úr valmyndinni "
 "Kerfi >> Kjörstillingar."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Staðfestu stillingar ferðabreiðbands"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(ekkert)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Skilríki í %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(óþekkt)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Velja"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Veldu úr skrá…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Veldu %s skilríki"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Skilríki notanda:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Villa við að opna setu: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Aflæsa teikni"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Gefið út af"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Settu inn PIN-númer %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Innskráning"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Muna PIN-númer"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Geyma lykilorðið aðeins fyrir þennan notanda"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Geyma lykilorðið fyrir alla notendur"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Spyrja í hvert sinn um þetta lykilorð"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Lykilorðsins er ekki krafist"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Sýna lykil_orð"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Þriðja _lykilorð:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Auka-lykilorð"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Lykilorð:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Smelltu til að tengjast"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Annaðhvort vantar lykilorð eða að tengingin er ógild. Í seinna tilvikinu "
-"þarftu fyrst að breyta tengingunni í nm-connection-editor"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "_Nýtt…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Breytilegt (dynamic) WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Búa til"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
-"Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu '%"
-"s'."
+"Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu "
+"'%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi netkerfisauðkenningar krafist"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Auðkenningar er krafist af Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Búa til nýtt Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nýtt Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Settu inn heiti fyrir Wi-Fi netkerfið sem þú vilt búa til."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Tengjast við falið Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Falið Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4460,35 +4437,56 @@ msgstr ""
 "Settu inn heiti og öryggisupplýsingar fyrir falda Wi-Fi netkerfið sem þú "
 "vilt tengjast."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Öruggt _Wi-Fi"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Ten_ging:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "W_i-Fi_netkort:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Ég finn ekki þjónustuaðilann _minn og vil því setja handvirkt inn "
+"upplýsingar um hann:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Þjónustuveita:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Listi yfir land eða svæði:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land eða svæði"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Um kapal"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4498,17 +4496,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Annaðhvort vantar lykilorð eða að tengingin er ógild. Í seinna tilvikinu "
+"þarftu fyrst að breyta tengingunni í nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Öruggt _Wi-Fi"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Heiti _netkerfis:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ten_ging:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "W_i-Fi_netkort:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4516,7 +4538,7 @@ msgstr ""
 "Þetta forrit er hluti af NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4524,379 +4546,386 @@ msgstr ""
 "Það er ekki hannað til notkunar á skipanalínu heldur keyrir samtvinnað í "
 "GNOME skjáborðsumhverfinu."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "óvirkt"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "óskráð"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimanet (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Heimanet"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "leita"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "skráningu hafnað"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s reiki)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (reiki)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Reikinet (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Reikinet"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-númer fyrir SIM-kortið '%s' á '%s'"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Krafist er PIN-númers"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 "Þú þarft að slá inn PIN-númer til að þess að tengjast við "
 "ferðabreiðbandstækið (síma/netpung)"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Ferðabreiðbandstenging '%s' virk: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "reiki"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s tenging"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM skilríki (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, eða PKCS#12 einkalyklar (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "óskilgreind villa í öruggu 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "ekkert CA skilríki valið"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "vantar EAP-FAST PAC skrá"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Veldu PAC-skrá"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC skrár (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Allar skrár"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Nafnlaust"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Auðkennt"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Bæði"
 
-#: ../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:3
-#| msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "_Nafnlaust auðkenni"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-#| msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "PAC _skrá"
 
-#: ../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:1
-#| msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "_Innri auðkenning"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leyfa sjálfvirka PAC _veitingu (provisioning)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "vantar EAP-LEAP notandanafn"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "vantar EAP-LEAP lykilorð"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Útgáfa 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Útgáfa 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#| msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "PEAP út_gáfa"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Lén"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "vantar EAP notandanafn"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "vantar EAP lykilorð"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit lykilsetning"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Sýna lykil_orð"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "vantar EAP-TLS auðkenni"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA skilríkis e_r ekki krafist"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#| msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "_Auðkenni"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ekkert EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Óþekkt villa við að sannreyna 802.1X öryggi"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "_Auðkenning"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "vantar leap-notandanafn"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "vantar leap-lykilorð"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "vantar wep-lykil"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "ógildur wep-lykill: lykill með lengdina %zu má aðeins innihalda hex-stafi"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "ógildur wep-lykill: lykill með lengdina %zu má aðeins innihalda ascii-stafi"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 "ógildur wep-lykill: röng lengd lykils %zu. Lengd lykils verður að vera annað "
-"hvort 5/13 "
-"(ascii) eða 10/26 (hex)"
+"hvort 5/13 (ascii) eða 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ógildur wep-lykill: lykilfrasi má ekki vera tómur"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ógildur wep-lykill: lykilfrasi verður að vera styttri en 64 stafir"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Opið kerfi"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Dreifilykill"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (sjálfgefið)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-#| msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Lykill"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Sýna lykil"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-#| msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP _vísir"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4905,15 +4934,48 @@ msgstr ""
 "ógildur wpa-psk: röng lengd lykils %zu. Lengd lykils verður að vera annað "
 "hvort [8,63] bæti eða 64 hex-stafir"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ógildur wpa-psk: get ekki túlkað lykil með 64 bætum sem hex"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-#| msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Tegund"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (sjálfgefið)"
+
+#~ msgid "Ignored"
+#~ msgstr "Hunsað"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Mistókst að uppfæra leyndarauðkenni tengingar vegna óþekktrar villu."
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Tengjast þessu neti sjálfkrafa þegar það er tiltækt"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation"
+#~ msgstr "_Upplýsingar um tengingu"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Get ekki tekið á móti VPN-nettengingu"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Skráin '%s' var ekki lesanleg eða að hún inniheldur ekki þekkjanlegar VPN "
+#~ "tengiupplýsingar\n"
+#~ "\n"
+#~ "Villa: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "óþekkt villa"
+
 #~ msgid "Priority:"
 #~ msgstr "Forgangur:"
 
diff --git a/po/it.po b/po/it.po
index 1039b950..0aceefc8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,9 +16,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-02-27 18:32+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-02-28 09:22+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -30,7 +30,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rete"
 
@@ -219,7 +220,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "Autenticazione 802.1X"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -466,117 +467,117 @@ msgstr "dispositivo non gestito"
 msgid "No network devices available"
 msgstr "Nessun dispositivo di rete disponibile"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Connessioni _VPN"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configura VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "A_ggiungi connessione VPN…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager non è in esecuzione…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Funzionalità di rete disabilitate"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Abilita funzionalità di _rete"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Abilita _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Abilita rete a banda larga _mobile"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Abilita n_otifiche"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Informazioni _connessione"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Modifica connessioni…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Attualmente connessi a «%s»."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Disconnessi"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "La connessione di rete è stata terminata."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparazione della connessione di rete «%s»…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Richiesta autenticazione utente per la connessione di rete «%s»…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Richiesta di un indirizzo di rete per «%s»…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Connessione di rete «%s» attiva"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Avvio della connessione VPN «%s»…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Richiesta autenticazione utente per la connessione VPN «%s»…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Richiesta di un indirizzo VPN per «%s»…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Connessione VPN attiva"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nessuna connessione di rete"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
@@ -593,7 +594,7 @@ msgstr "Codice PIN errato; contattare il provider."
 msgid "Sending unlock code…"
 msgstr "Invio codice di sblocco…"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga mobile (%s)"
@@ -715,7 +716,7 @@ msgstr "Connessione Ethernet «%s» attiva"
 msgid "DSL authentication"
 msgstr "Autenticazione DSL"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -824,180 +825,189 @@ msgstr "Connessione Wi-Fi «%s» attiva"
 msgid "Failed to activate connection"
 msgstr "Attivazione della connessione non riuscita"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Errore nel visualizzare le informazioni di connessione:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinamico"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Altri indirizzi"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nessuna"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Indirizzo di broadcast"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Maschera di rete"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "DNS primario"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "DNS secondario"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "DNS terziario"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Generale"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Indirizzo hardware"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocità"
 
-#: src/applet-dialogs.c:584
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Sicurezza"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Instradamento predefinito"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Password:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipo VPN"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Gateway VPN"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nome utente VPN"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Banner VPN"
 
 # o non tradotto? mica me lo ricordo...
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Connessione base"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Sconosciuta"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Non è presente alcuna connessione attiva valida."
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1007,22 +1017,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e molti altri contributi e traduzioni dalla comunità"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Un'applet per l'area di notifica per la gestione delle interfacce e delle "
 "connessioni di rete."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Sito web di NetworkManager"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Milo Casagrande <milo@milo.name>"
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1030,33 +1040,33 @@ msgstr ""
 "L'applet NetworkManager non è riuscita a trovare alcune risorse richieste "
 "(il file .ui non è stato trovato)."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Risorse mancanti"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Password per la rete a banda larga mobile"
 
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "È richiesta una password per connettersi a «%s»."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Password:"
 
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Richiesto codice PIN della SIM"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Richiesta codice PIN della SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1066,25 +1076,25 @@ msgstr ""
 "prima di poter essere usato."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Codice PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Mostra codice PIN"
 
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Richiesto codice PUK della SIM"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Richiesta codice PUK della SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1094,36 +1104,36 @@ msgstr ""
 "prima di poter essere usato."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Codice PUK:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nuovo codice PIN:"
 
 # [NdT] lo so che non è letterale, ma rende meglio l'idea
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Verifica nuovo codice PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostra codici PIN/PUK"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "La connessione non ha una configurazione VPN"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Scrittura della connessione non riuscita: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Scrittura della connessione non riuscita: scrittura incompleta"
 
@@ -3048,10 +3058,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Client"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Hotspot"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
@@ -3917,12 +3923,12 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "L'operatore usa una tecnologia di tipo C_DMA (es. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4205,6 +4211,10 @@ msgstr "Informazioni connessione"
 msgid "_Close"
 msgstr "_Chiudi"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4249,32 +4259,28 @@ msgstr "_Certificato %s"
 msgid "My country is not listed"
 msgstr "Nazione non presente in elenco"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Non elencato"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Piano tariffario non presente…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Operatore"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Nazione o regione"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM installato"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA installato"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Qualsiasi dispositivo"
 
@@ -4308,23 +4314,24 @@ msgstr ""
 "L'APN (Nome Punto d'Accesso) del proprio piano tariffario di banda larga "
 "(solo in alcuni casi)"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Creare una connessione per ques_to dispositivo a banda larga mobile:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Imposta una connessione a banda larga mobile"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Elenco nazioni o regioni:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Nazione o regione"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Scegliere la nazione o la regione del proprio operatore"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Selezionare il proprio operatore da un e_lenco:"
 
@@ -4610,6 +4617,14 @@ msgstr "Operatore non presente, inserirlo _manualmente:"
 msgid "Provider:"
 msgstr "Operatore:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Elenco nazioni o regioni:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Nazione o regione"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Via cavo"
diff --git a/po/ja.po b/po/ja.po
index 3b671594..c2be2029 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -17,8 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-01-30 12:06+0000\n"
 "Last-Translator: amoewaki <amoewaki@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -29,45 +30,54 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "ネットワーク接続を管理"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "Raw 設定"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "ネットワーク接続セッティングの管理と変更"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "接続通知を無効にする"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "これを true にすると、ネットワークへの接続中の通知を無効にします。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "切断通知を無効にする"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "これを true にすると、ネットワークからの切断中の通知を無効にします。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN 通知を無効にする"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -75,57 +85,58 @@ msgstr ""
 "これを true にすると、VPN への接続、あるいは VPN からの切断の際の通知を無効に"
 "します。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ネットワーク使用可能通知を抑制する"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "これを true にすると、無線ネットワークが利用可能になった時の通知を無効にしま"
 "す。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "スタンプ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi の作成を無効にする"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "これを true にすると、アプレットでのアドホックネットワークの作成を無効にしま"
 "す。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "通知領域にアプレットを表示する"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "これを false にすると、通知領域にアプレットを表示するのを無効化します。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA 証明書を無視"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 "これを true にすると、EAP の認証中の CA 証明書関連の警告を無効にします。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -133,15 +144,15 @@ msgstr ""
 "これを true にすると、EAP 認証のフェーズ 2 での CA 証明書関連の警告を無効にし"
 "ます。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager 接続エディター"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -149,7 +160,7 @@ msgstr ""
 "NetworkManager は、ネットワーク接続およびデバイスを管理、設定するためのシステ"
 "ムサービスです。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -157,23 +168,23 @@ msgstr ""
 "nm-connection-editor プログラムは、NetworkManager と連携して NetworkManager "
 "用の接続プロファイルを作成し、また既存の接続プロファイルを編集します。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager 開発者"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 "オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -181,19 +192,19 @@ msgstr ""
 "オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ"
 "ん"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは"
 "ありません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "プロパティー '%s' (タイプ '%s') を、タイプ '%s' の値から設定できません"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -202,82 +213,81 @@ msgstr ""
 "値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効また"
 "は範囲外です"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X の認証"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "取り消し(_C)"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "接続(_O)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "ネットワーク名(_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "アドホック"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "セキュア。"
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "接続の追加、あるいは有効化に失敗しました"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "接続に失敗"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "デバイスの切断に失敗しました"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "切断失敗"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "接続のアクティベートに失敗しました"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "このメッセージを今後表示しない"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +297,7 @@ msgstr ""
 "\n"
 "ネットワーク接続が中断されたため、VPN 接続 '%s' は切断されました。"
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -297,7 +307,7 @@ msgstr ""
 "\n"
 "ネットワーク接続が中断されたため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +316,7 @@ msgstr ""
 "\n"
 "VPN サービスが予期せずに停止したため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -316,7 +326,7 @@ msgstr ""
 "\n"
 "VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。"
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +335,7 @@ msgstr ""
 "\n"
 "接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +344,7 @@ msgstr ""
 "\n"
 "VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +353,7 @@ msgstr ""
 "\n"
 "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +362,7 @@ msgstr ""
 "\n"
 "有効な VPN シークレットがないため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -361,7 +371,7 @@ msgstr ""
 "\n"
 "VPN シークレットが無効なため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -370,7 +380,7 @@ msgstr ""
 "\n"
 "VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -381,19 +391,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 接続の確立に成功しました。\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN ログインメッセージ"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN 接続は失敗しました"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -406,7 +416,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -419,560 +429,571 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "デバイスの準備ができていません (ファームウェア未検出)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "デバイスの準備ができていません"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "切断されています"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "切断する"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "デバイスは管理されていません"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ネットワークデバイスがありません"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN 接続(_V)"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPN を設定(_C)..."
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "VPN 接続を追加(_A)"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager は実行されていません..."
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ネットワークは無効になっています"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "ネットワークを有効にする(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi を有効にする(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "モバイルブロードバンドを有効にする(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "通知を有効にする(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "接続情報(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "接続を編集する..."
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "現在'%s' に接続しています。"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "切断されました"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ネットワーク接続が切断されました。"
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ネットワーク接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' のネットワークアドレスを要求しています..."
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "ネットワーク接続 '%s' はアクティブです。"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN 接続 '%s' を開始しています..."
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' の VPN アドレスを要求しています..."
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN 接続はアクティブです"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ネットワーク接続がありません"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager アプレット"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK が違います。プロバイダーに連絡してください。"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN が違います。プロバイダーに連絡してください。"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "ロック解除コードを送信中..."
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "モバイルブロードバンド (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "利用可能"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "新規のモバイルブロードバンド接続…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "接続を確立しました"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "モバイルブロードバンドネットワーク"
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "ホームネットワークに接続しました。"
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "ローミングネットワークに接続しました。"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' を準備中です..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' を設定中です..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "モバイルブロードバンド接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "モバイルブロードバンド接続 '%s' はアクティブです。"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動 Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr " Ethernet ネットワーク (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr " Ethernet ネットワーク (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr " Ethernet ネットワーク"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr " Ethernet ネットワーク"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr " Ethernet ネットワークに接続しました。"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr " Ethernet ネットワーク接続 '%s' を準備中です..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr " Ethernet ネットワーク接続 '%s' を設定中です..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr " Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' の Ethernet ネットワークアドレスを要求しています..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet ネットワーク接続 '%s' はアクティブです"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "非表示 Wi-Fi ネットワークに接続する(_C)"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "新規 Wi-Fi ネットワークを作成(_N)"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "新規接続の追加に失敗しました"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "権限が不足しています。"
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi ネットワーク"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi は無効になっています"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi はハードウェアのスイッチで無効になっています"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "その他のネットワーク"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi ネットワークは利用可能です"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi ネットワークに接続するにはネットワークメニューを使用します。"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Wi-Fi ネットワーク '%s' に接続しました。"
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ネットワーク接続 '%s' を設定中です..."
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi ネットワーク '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' の Wi-Fi ネットワークアドレスを要求しています..."
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr " Wi-Fi ネットワーク接続 '%s' はアクティブです"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "接続のアクティベートに失敗しました"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "接続情報の表示中にエラーが起きました:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "動的 WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "その他のアドレス"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (デフォルト)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP アドレス"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ブロードキャストアドレス"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "サブネットマスク"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "プライマリー(_P):"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "セカンダリーパスワード(_S):"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "全般"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ドライバー"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "速度"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "セキュリティー:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "デフォルトルート"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "無視"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "ホットスポット"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "パスワード:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN の種類"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN ゲートウェイ"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN ユーザー名"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN バナー"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ベース接続"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "有効なアクティブ接続がありません!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -982,20 +1003,20 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ネットワークデバイスと接続を管理するための通知領域アプレット。"
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager ウェブサイト"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "翻訳者クレジット"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1003,33 +1024,33 @@ msgstr ""
 "NetworkManager アプレットは、必要なリソースをいくつか見つけられませんでした "
 "(.ui ファイルが見つかりません)。"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "不足しているリソース"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドネットワークのパスワード"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' への接続にはパスワードが必要です。"
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN のアンロックが必要です"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN の開錠が必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1038,25 +1059,25 @@ msgstr ""
 "モバイルブロードバンドデバイス %s' を使用するには SIM PIN コードが必要です。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN コード:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN コードを表示"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK のアンロックが必要です"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK のアンロックが必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,41 +1086,41 @@ msgstr ""
 "モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK コード:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "新規の PIN コード:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "新規の PIN コードを再入力:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK コードを表示"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "接続には VPN 設定がありませんでした"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "VPN UI への接続の書き込みに失敗しました: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "VPN UI への接続の書き込みに失敗しました: 不完全な書き込み"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1107,56 +1128,56 @@ msgstr ""
 "IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押し"
 "て IP アドレスを追加します。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "自動取得したルートを無視する(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "この接続を、そのネットワーク上のリソースにのみ使用(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "有効にすると、この接続はデフォルトのネットワーク接続として 使用されません。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "作成(_R)…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "接続の種類を選んでください"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1168,90 +1189,100 @@ msgstr ""
 "VPN 接続の一覧に、作成したい VPN 接続がにない場合は、正しい VPN プラグインが"
 "インストールされていない可能性があります。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "デバイス(_D):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "ラウンドロビン"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "アクティブバックアップ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ブロードキャスト"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "適応送信のロードバランス"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "適応ロードバランス"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (推奨)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
 msgid "Bonded _connections"
 msgstr "Bond 接続(_C):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 #, fuzzy
 msgid "M_ode"
 msgstr "モード(_O):"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
 msgid "Monitoring _frequency"
 msgstr "監視周期(_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
 msgid "_Interface name"
 msgstr "インターフェース名(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
 msgid "_Link Monitoring"
 msgstr "リンク監視(_L)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 #, fuzzy
 msgid "ARP _targets"
 msgstr "ARP 対象(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1259,22 +1290,22 @@ msgstr ""
 "リンク状態を確認する単一の IP アドレス、またはコンマ区切りの複数 IP アドレス"
 "のリスト。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
 msgid "Link _up delay"
 msgstr "接続遅延(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
 msgid "Link _down delay"
 msgstr "接断遅延(_D):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
 msgid "_Primary"
 msgstr "プライマリー(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1282,73 +1313,76 @@ 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
 msgid "_MTU"
 msgstr "MTU(_M):"
 
-#: ../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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "バイト"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 #, fuzzy
 msgid "Path _cost"
 msgstr "経路のコスト(_C):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
 msgid "_Priority"
 msgstr "優先度(_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
 msgid "_Hairpin mode"
 msgstr "ヘアピンモード(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
 msgid "Bridged _connections"
 msgstr "ブリッジ接続(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
 msgid "_Forward delay"
 msgstr "転送遅延(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
 msgid "_Hello time"
 msgstr "Hello タイム(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP フォワード遅延 (秒単位)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP Hello タイム (秒単位)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "IGMP スヌーピングを有効にする(_G)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1358,18 +1392,18 @@ msgstr ""
 "不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決す"
 "るまでこの機能が有効にならないことがあります。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (スパニングツリープロトコル) を有効にする(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し"
 "ます。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1377,30 +1411,30 @@ msgstr ""
 "このブリッジにおける STP の優先度。値が小さい方が優先度が高くなります。優先度"
 "が一番低いブリッジが root ブリッジに選択されます。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
 msgid "_Max age"
 msgstr "最大エイジ(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "STP メッセージの最大エイジ (秒単位)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 #, fuzzy
 msgid "_Aging time"
 msgstr "エージング時間(_A):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 #, fuzzy
 msgid "Group _forward mask"
 msgstr "グループの転送マスク(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1412,40 +1446,40 @@ msgstr ""
 "スクには、ビット 0、1、または 2 を設定することができません。STP で使用する"
 "と、MAC がフレームと LACP を停止するためです。"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自動"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "デフォルト"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "原因不明のエラー"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "保存"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "永続"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "ランダム"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "安定"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1455,192 +1489,235 @@ msgstr ""
 "ハードウェアアドレスとして使用されます。この機能は MAC クローニングあるいは "
 "MAC スプーフィングと呼ばれます。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC アドレス"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "ハードウェアアドレス"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s の無効な %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "無効な %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "%s の無効なインターフェース名 (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "無効なインターフェース名 (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "デバイス名を解析できません"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "無効なハードウェアアドレス"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "無効な %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "デバイス"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "無効な %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "この接続に Data Center Bridging (DCB) を使用する(_U)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "フロー制御"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "機能"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "有効化"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "アドバタイズ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "用意がある"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "優先度"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "オプション..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "優先グループ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "ファブリック"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "優先フロー制御"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは無効にしてください。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 #, fuzzy
 msgid "0"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 #, fuzzy
 msgid "1"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 #, fuzzy
 msgid "2"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 #, fuzzy
 msgid "3"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 #, fuzzy
 msgid "4"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 #, fuzzy
 msgid "5"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 #, fuzzy
 msgid "6"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 #, fuzzy
 msgid "7"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 #, fuzzy
 msgid "Traffic Class"
 msgstr "トラフィッククラス:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 #, fuzzy
 msgid "Strict Bandwidth"
 msgstr "厳密な帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
 msgid "Priority Bandwidth"
 msgstr "優先帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 #, fuzzy
 msgid "Group Bandwidth"
 msgstr "グループ帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 #, fuzzy
 msgid "Group ID"
 msgstr "グループ ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "各ユーザー優先度に優先グループ ID を入力してください。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1648,35 +1725,35 @@ msgstr ""
 "優先グループが使用する利用可能なリンク帯域幅のパーセンテージを入力してくださ"
 "い。各グループの合計を 100% にする必要があります。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してくだ"
 "さい。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "ユーザー優先度の正確な帯域幅を有効または無効にしてください。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "各ユーザー優先度にトラフィッククラスを入力してください。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
 msgid "_Username"
 msgstr "ユーザー名(_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "ユーザー名は、PPPoE サービスでの認証に使用されました。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1684,58 +1761,56 @@ msgstr ""
 "指定したサービスを提供するアクセス集線装置だけを使用してセッションを開始しま"
 "す。多くのプロバイダーでは、これを空白にする必要があります。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 #, fuzzy
 msgid "_Service"
 msgstr "サービス(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "PPPoE サービスでの認証に使用されるパスワード。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
 msgid "_Password"
 msgstr "パスワード(_P):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 #, fuzzy
 msgid "PPP _interface"
 msgstr "PPP インスタンス(_I):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 #, fuzzy
 msgid "P_arent interface"
 msgstr "親インスタンス(_A):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "新規作成された PPP インターフェースに割り当てる任意の名前。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "PPP 接続が確立されるインターフェース。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 #, fuzzy
 msgid "C_laim interface"
 msgstr "親インスタンス(_A):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1743,142 +1818,134 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ツイストペア (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "半分"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "すべて"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "手動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
 msgid "_Port"
 msgstr "ポート(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-#, fuzzy
-msgid "_Device"
-msgstr "デバイス(_D):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
 msgid "C_loned MAC address"
 msgstr "クローンした MAC アドレス(_L):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 #, fuzzy
 msgid "Wake on LAN"
 msgstr "Wake on LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "無視する(_I)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "Phy(_P)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "ユニキャスト(_U)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "マルチキャスト(_T)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "ブロードキャスト(_B)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "Arp(_A)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Magic(_G)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
 msgid "_Wake on LAN password"
 msgstr "Wake on LAN パスワード(_W):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 #, fuzzy
 msgid "Lin_k negotiation"
 msgstr "リンクネゴシエーション(_K):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1888,12 +1955,12 @@ msgstr ""
 "認せずに「スピード」および「二重」の値が強制されます。不明な場合は、「無視」"
 "にしておくか「自動」を選択してください。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
 msgid "_Speed"
 msgstr "スピード(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1903,12 +1970,12 @@ msgstr ""
 "択していない場合にのみ必要になります。速度の値を指定する前に、デバイスがサ"
 "ポートしていることを確認してください。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
 msgid "Duple_x"
 msgstr "二重(_X):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1918,35 +1985,35 @@ msgstr ""
 "していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサ"
 "ポートしていることを確認してください。"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 #, fuzzy
 msgid "No"
 msgstr "なし"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "全ユーザーがこのネットワークに接続可能とする(_U)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
 msgid "Automatically connect to _VPN"
 msgstr "この接続を使用したときは自動的に VPN に接続する(_V)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
 msgid "Firewall _zone"
 msgstr "ファイアウォールゾーン(_Z):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
 msgid "_Metered connection"
 msgstr "チーム接続(_T):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1954,12 +2021,12 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
 msgid "Connect _automatically with priority"
 msgstr "自動取得したルートを無視する(_N)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1968,7 +2035,7 @@ msgstr ""
 "自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択"
 "時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。"
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1976,7 +2043,7 @@ msgstr ""
 "IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押し"
 "て、自動設定とは別に設定される静的 IP アドレスを追加します。"
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1987,136 +2054,135 @@ msgstr ""
 "するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加しま"
 "す。アドレスが提供されないと、範囲は自動的に決定します。"
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "その他の静的アドレス"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "アドレス"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "アドレス (オプション)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "データグラム型"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "コネクション型"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 #, fuzzy
 msgid "_Transport mode"
 msgstr "転送モード(_T):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "デバイス名:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "親デバイス:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "モード:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 #, fuzzy
 msgid "Local IP"
 msgstr "ローカル IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 #, fuzzy
 msgid "Remote IP"
 msgstr "リモート IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 #, fuzzy
 msgid "Input key"
 msgstr "入力キー:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 #, fuzzy
 msgid "Output key"
 msgstr "出力キー:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "自動 (DNS 設定は手動)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "リンクローカル"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "他のコンピューターへ共有"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
 msgid "_Method"
 msgstr "方式(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2126,8 +2192,8 @@ msgstr ""
 "スタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま"
 "す。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2135,28 +2201,26 @@ msgstr ""
 "ホスト名を解決する時に使用するドメイン。複数のドメインを分離する時はコンマを "
 "使います。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
 msgid "D_HCP client ID"
 msgstr "DHCP クライアント ID(_H):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
 msgid "S_earch domains"
 msgstr "ドメインを検索(_E):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
 msgid "DNS ser_vers"
 msgstr "DNS サーバー(_V):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2164,11 +2228,11 @@ msgstr ""
 "ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま"
 "す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "この接続を完了するには、IPv4 アドレスが必要 (_4)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2176,34 +2240,34 @@ msgstr ""
 "IPv4 設定が失敗して、IPv6 設定が成功する場合は、IPv6 対応のネットワークに接続"
 "する時に接続が完了するまで待ちます。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "ルート(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "無効"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "有効 (公開アドレスを優先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "有効 (一時アドレスを優先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "安定したプライバシー"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2213,21 +2277,21 @@ msgstr ""
 "す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。リ"
 "ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 #, fuzzy
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 のプライバシー拡張(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 #, fuzzy
 msgid "IPv6 address _generation mode"
 msgstr "IPv6 アドレス生成モード(_G):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "この接続が完了するには、IPv6 アドレスが必要 (_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2235,28 +2299,28 @@ msgstr ""
 "IPv6 設定が失敗し、IPv4 設定が成功する場合は、IPv4 対応のネットワークに接続す"
 "る時に接続が完了するまで待ちます。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "チェック"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "厳密"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "MACsec デバイスの名前。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2264,22 +2328,22 @@ msgstr ""
 "この MACSEC インターフェースが作成される親インターフェースの名前、または親接"
 "続の UUID。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 "この MACsec インターフェースが作成される親インターフェースまたは親接続の UUID"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr "共有前の接続に関連するキー名"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "共有前の接続に関連するキー"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2288,217 +2352,217 @@ msgstr ""
 "MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。EAP "
 "モードでは、802.1X セキュリティーページにパラメーターを追加します。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 #, fuzzy
 msgid "CKN"
 msgstr "CKN:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 #, fuzzy
 msgid "CAK"
 msgstr "CAK:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 #, fuzzy
 msgid "Keys"
 msgstr "キー:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 #, fuzzy
 msgid "Parameters"
 msgstr "パラメーター:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 #, fuzzy
 msgid "Validation"
 msgstr "検証:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 #, fuzzy
 msgid "SCI port"
 msgstr "SCI ポート:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "入力フレームの検証モードを指定します"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "暗号化"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "転送トラフィックの暗号化が必要かどうか"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "SCI (セキュアチャネル識別子) のポートコンポーネント"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
 msgid "Nu_mber"
 msgstr "番号(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "高度"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 #, fuzzy
 msgid "_APN"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
 msgid "N_etwork ID"
 msgstr "ネットワーク ID(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "変更..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 #, fuzzy
 msgid "P_IN"
 msgstr "PIN 番号(_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "ホームネットワークが利用できない場合にローミングを許可(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "パスワードを表示(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "認証"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 #, fuzzy
 msgid "Allowed methods"
 msgstr "利用可能な認証方法:"
 
 # "auth_methods_button"ボタンのラベル
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "認証方法を設定する(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "圧縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "MPPE (ポイントツーポイント暗号化) を使用する(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128 ビットの暗号化を要求する(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ステートフル MPPE を使用する(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD データ圧縮を許可する(_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Deflate データ圧縮を許可する(_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP ヘッダー圧縮を使用する(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP Echo のパケットを送信(_E)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "なし"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "ブラウザー専用"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 #, fuzzy
 msgid "PAC URL"
 msgstr "PAC URL:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 #, fuzzy
 msgid "PAC script"
 msgstr "PAC スクリプト:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "PAC スクリプトの取得先となる URL。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "ファイルからスクリプトをインポート..."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 #, fuzzy
 msgid "Method"
 msgstr "方式:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "高度(_V)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "マスターで設定"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Ethernet ポートの状態"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "チームの高度なオプション"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 #, fuzzy
 msgid "_Queue ID"
 msgstr "キュー ID(_ID):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2506,55 +2570,55 @@ msgstr ""
 "ポートの有効化または無効化後に送信された、未承諾 NA および余分な ARP パケット"
 "のバースト数。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "このポートのマッピング先となるキューの ID。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Active-Backup ランナーオプション"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
 msgid "_Port priority"
 msgstr "ポート優先度(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
 "値は正の数(ミリ秒単位)。notify-peer パケットのバーストの間隔を指定します。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "ポート優先度。数字が大きい方が優先度が高くなります。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "ポート付箋(_S)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP ランナーオプション"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
 msgid "_LACP port priority"
 msgstr "LACP ポート優先度(_L):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
 msgid "LACP port _key"
 msgstr "LACP ポートキー(_K):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2562,15 +2626,15 @@ msgstr ""
 "ポートの有効化または無効化後に送信された、マルチキャストグループ再参加リクエ"
 "ストのバースト数。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 "LACP 標準に準拠したポート優先度。数字が小さい方が優先度が高くなります。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2578,62 +2642,62 @@ msgstr ""
 "値は正の数 (ミリ秒単位) です。マルチキャストグループ再参加リクエストのバース"
 "トの間隔を指定します。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr "LACP 標準に準拠したポートキー。同じキーのポートだけが統合できます。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 #, fuzzy
 msgid "_Link watcher"
 msgstr "リンクウォッチャー(_L):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
 msgid "_Up delay"
 msgstr "アップ遅延(_U):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
 msgid "_Down delay"
 msgstr "ダウン遅延(_D):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
 msgid "Send _interval"
 msgstr "送信間隔(_I):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 #, fuzzy
 msgid "Delay _before first send"
 msgstr "初回送信までの遅延(_B):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 #, fuzzy
 msgid "_Maximum missed replies"
 msgstr "不在着信となった返信の最大数(_M):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 #, fuzzy
 msgid "_Source host"
 msgstr "ソースホスト(_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
 msgid "_Target host"
 msgstr "ターゲットホスト(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2641,8 +2705,8 @@ msgstr ""
 "不在着信となった返信の最大数。この数値を超えるとリンクがダウンしていると報告"
 "されます。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2650,8 +2714,8 @@ msgstr ""
 "IP アドレスに変換されるホスト名。この名前は、ソースアドレスとして ARP リクエ"
 "ストに記入されます。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2659,13 +2723,13 @@ msgstr ""
 "IP アドレスに変換されるホスト名で、宛先アドレスとしてリクエストに記入されま"
 "す。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "アクティブなポートからの無効なパケットを無視(_A)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2673,13 +2737,13 @@ msgstr ""
 "アクティブなポートで受信した ARP パケットを検証します。これを確認しないと、着"
 "信 ARP パケットがすべて正常な返信とみなされます。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "アクティブでないポートからの無効なパケットを無視(_N)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2687,13 +2751,13 @@ msgstr ""
 "アクティブでないポートで受信した ARP パケットを検証します。これを確認しない"
 "と、着信 ARP パケットはすべて正常な返信とみなされます。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "アクティブでないポートで送信(_E)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2701,164 +2765,163 @@ msgstr ""
 "デフォルトでは、ARP リクエストはアクティブなポートでのみ送信されます。このオ"
 "プションを使用すると、アクティブでないポートでも送信されるようになります。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "リクエストの送信間隔。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "リンクウォッチの初期化から初回リクエスト送信までの遅延。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "使用するリンクウォッチャー。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "リンクウォッチャー"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "ファイルからチーム設定をインポートする(_P)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
 msgid "Edit _JSON configuration"
 msgstr "JSON 設定の編集(_J):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Raw 設定"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "最高の優先度"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "最高の優先度 (安定)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "帯域幅"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "ポートの最大数"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "ポートの優先度"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "チームデバイスから"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "アクティブなポートから"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "アクティブからチームデバイスへ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
 msgid "_Teamed connections"
 msgstr "チーム接続(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "ロードバランス"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "すべての L3 プロトコル"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "すべての L4 プロトコル"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 #, fuzzy
 msgid "_Peer notification count"
 msgstr "ピア通知数(_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 #, fuzzy
 msgid "Peer _notification interval"
 msgstr "ピア通知間隔(_N):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 #, fuzzy
 msgid "_Multicast rejoin count"
 msgstr "マルチキャスト再参加数(_M):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 #, fuzzy
 msgid "Multicast _rejoin interval"
 msgstr "マルチキャスト再参加間隔(_R):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
 msgid "_Hardware Address"
 msgstr "ハードウェアアドレス(_H):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2866,21 +2929,21 @@ msgstr ""
 "新規チームデバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま"
 "す。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 #, fuzzy
 msgid "_Runner"
 msgstr "ランナー(_R):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
 msgid "_Hardware address policy"
 msgstr "ハードウェアアドレスポリシー(_H):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "使用するランナー名。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2888,11 +2951,11 @@ msgstr ""
 "チームのライフタイム中に、チームデバイスおよびポートデバイスのハードウェアア"
 "ドレスを設定する方法に関するポリシーを定義します。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "LACPDU フレームを定期的に送信(_P)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2900,11 +2963,11 @@ msgstr ""
 "これにチェックを入れると、設定済みリンクとともに LACPDU フレームが定期的に送"
 "信されます。チェックを入れない場合は、「通信があった場合に応答」します。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "LACPDU フレーム毎秒送信(_E)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2914,26 +2977,26 @@ msgstr ""
 "指定します。これにチェックを入れると、パケットは毎秒送信されます。チェックを"
 "入れない場合は、30 秒ごとに送信されます。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
 msgid "_System priority"
 msgstr "システム優先度(_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 #, fuzzy
 msgid "_Minimum ports"
 msgstr "最小ポート数(_M):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 #, fuzzy
 msgid "_Aggregator selection policy"
 msgstr "アグリゲーター選択ポリシー(_A):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "システム優先度。値の範囲は 0 – 65535 になります。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2941,213 +3004,209 @@ msgstr ""
 "マスターインターフェースにキャリアをアサートする前にアクティブにする必要があ"
 "るポートの最小数を指定します。値の範囲は 1 – 255 になります。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "アグリゲーターを選択する方法に関するポリシーを指定します。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr ""
 "パケット Tx ハッシュ計算に使用するフラグメントタイプ (文字列) のリスト。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "転送ハッシュのフィールド(_F)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "十分の一秒単位。リバランスの間隔。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "アクティブ Tx バランサーの名前。アクティブ Tx バランサーは、デフォルトでは無"
 "効になっています。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
 msgid "Transmission _balancing interval"
 msgstr "転送バランシングの間隔(_B):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
 msgid "_Transmission balancer"
 msgstr "転送バランサー(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "ランナー"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
 msgid "_Parent interface"
 msgstr "親インターフェース(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
 msgid "VLAN inter_face name"
 msgstr "VLAN インターフェース名(_F):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
 msgid "Cloned MAC _address"
 msgstr "クローンの MAC アドレス(_A):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 #, fuzzy
 msgid "VLAN _id"
 msgstr "VLAN ID(_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 #, fuzzy
 msgid "Flags"
 msgstr "フラグ"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "並び替えヘッダー(_R)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "GVR(_G)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "ルースバインディング(_L)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "MVRP(_V)"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "デバイス名 + 番号"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 番号"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
 msgid "S_ecurity"
 msgstr "セキュリティー(_E):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "a (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "b/g (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "クライアント"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "ホットスポット"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "アドホック"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 #, fuzzy
 msgid "Transmission po_wer"
 msgstr "送信パワー(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 #, fuzzy
 msgid "_Rate"
 msgstr "レート(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 #, fuzzy
 msgid "_BSSID"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 #, fuzzy
 msgid "C_hannel"
 msgstr "チャンネル(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 #, fuzzy
 msgid "Ban_d"
 msgstr "バンド(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 #, fuzzy
 msgid "SS_ID"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "アクションを実行する polkit 権限がありません"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "許可された認証方法"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP(_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "拡張認証プロトコル (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP(_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "パスワード認証プロトコル (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP(_H)"
 
 # http://technet.microsoft.com/ja-jp/library/cc757631(WS.10).aspx
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "チャレンジハンドシェイク認証プロトコル (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP(_M)"
 
 # http://technet.microsoft.com/ja-jp/library/cc758984(WS.10).aspx
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft チャレンジハンドシェイク認証プロトコル (MS-CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v2(_2)"
 
 # http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Microsoft チャレンジハンドシェイク認証プロトコル バージョン2 (MS-CHAP v2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3155,67 +3214,65 @@ msgstr ""
 "通常、プロバイダーの PPP サーバーはすべての認証方法をサポートしています。接続"
 "が失敗する場合は、認証方法を一部無効にしてみてください。"
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP トンネル"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
@@ -3223,119 +3280,115 @@ msgstr ""
 "\n"
 "エラー: VPN サービスタイプがありません。"
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "インポートするファイルを選択する"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "仮想"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "保存した VPN 設定をインポートする..."
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "接続エディターのダイアログは、不明なエラーのため初期化できませんでした。"
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "接続の削除に失敗しました"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "接続 %s を削除してもよろしいですか?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 #, fuzzy
 msgid "_New Connection"
 msgstr "VPN 接続(_V)"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "アドレス"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "ネットマスク"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "メトリック"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "プレフィックス"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s の編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "無名の接続を編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "接続名がみつかりません"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "エディターの初期化中..."
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "接続を変更できません"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "無効な設定 %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3343,33 +3396,33 @@ msgstr ""
 "接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイ"
 "ルが見つかりませんでした)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "この接続に対する変更をすべて保存します。"
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "このマシンのすべてのユーザーに対して、この接続を保存するために認証する。"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "接続を編集できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "接続エディターダイアログの作成中に不明なエラーです。"
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3377,19 +3430,19 @@ msgstr ""
 "警告: この接続には、エディターがサポートしていないプロパティーが含まれていま"
 "す。保存後するとこれらは消去されます。"
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "エディターの初期化中にエラーです"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "接続の追加に失敗しました"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "修正"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3397,24 +3450,24 @@ msgstr ""
 "セキュリティーラベルにより、ファイルを証明書の認証に使用できない場合がありま"
 "す。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
 msgid "Connection _name"
 msgstr "接続名(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "エクスポート(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "ファイルの再ラベル付け"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "再ラベル付け(_R)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3422,207 +3475,207 @@ msgstr ""
 "以下のファイルは、証明書の認証向けにラベル付けされていません。ラベルを修正し"
 "ますか?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "再ラベル付け"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "ファイル名"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "未接続"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "接続中"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分前"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間前"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月前"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "接続を削除できません"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "編集する接続を選択"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "削除する接続を選択"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名前"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "選択した接続を編集する"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "選択した接続の編集を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "選択した接続を削除する"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "選択した接続の削除を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, fuzzy, c-format
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
 msgid "Unrecognized connection type"
 msgstr "サポートされていないモバイルブロードバンドの接続タイプ。"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, fuzzy, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "接続 '%s' の作成方法がわかりません"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 #, fuzzy
 msgid "Error importing connection"
 msgstr "接続の編集エラー"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "接続の作成中にエラー"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 #, fuzzy
 msgid "Connection type not specified."
 msgstr "接続を変更できません"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "VPN プラグインがインストールされていません"
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "接続 '%s' の作成方法がわかりません"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "接続の編集エラー"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' の接続が見つかりませんでした"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "ネットワーク接続"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "新規接続を追加"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X セキュリティー"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X セキュリティーユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "この接続に 802.1X セキュリティーを使用する(_X)"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Bluetooth デバイスの MAC アドレス。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth  ユーザーインターフェースを読み込めませんでした。"
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "無効な Bluetooth デバイス (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth 接続 %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth タイプ"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Bluetooth 接続プロファイルのタイプを選択します。"
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "パーソナルエリアネットワーク(_P)"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "ダイヤルアップネットワーク(_D)"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "bond ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "プライマリー"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ボンド接続 %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "ブリッジユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
@@ -3630,36 +3683,36 @@ msgstr "ブリッジ接続 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "ブリッジポート"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "ブリッジポートのユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "不明の親インターフェース"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3669,41 +3722,40 @@ msgstr ""
 "の両方で指定されたネットワークデバイスにこの接続をロックします。例: "
 "“em1”、“3C:97:0E:42:1A:19”、“em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "無視"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet のユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet デバイス"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "クローン MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN パスワード"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet 接続 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3713,11 +3765,11 @@ msgstr ""
 "ゾーンではなく、ファイアウォールでセットされているデフォルトのゾーンを利用す"
 "ることになります。これは firewalld がアクティブの場合にのみ有意です。"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "一般的なユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3729,168 +3781,160 @@ msgstr ""
 "“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)”"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband デバイス"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "IP トンネルユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP トンネル接続 %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "自動 (VPN) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "自動、アドレスのみ"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自動 (PPPoE) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "自動 (DHCP) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "ローカルへのリンク専用"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
 msgid "Additional DNS ser_vers"
 msgstr "追加の DNS サーバー(_V):"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
 msgid "Additional s_earch domains"
 msgstr "追加の検索ドメイン(_E):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s 用の IPv4 ルートを編集"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 アドレス '%s' が無効"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 アドレスネットマスク '%s' が無効"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 ゲートウェイ '%s' が無効"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS サーバー '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s 用の IPv6 ルートを編集"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 アドレス '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 プレフィックス “%s” が無効"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 ゲートウェイ '%s' が無効"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS サーバー '%s' が無効"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "MACsec ユーザーインターフェースを読み込めませんでした。"
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC 接続 %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "重複するスレーブ"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用されます。"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3899,25 +3943,25 @@ msgstr ""
 "スレーブ '%s' と '%s' は、それぞれ同じ物理デバイスの異なる仮想ポート ('%s' "
 "と '%s') へ適用されます。"
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s スレーブ %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "モバイルブロードバンドのユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "サポートされていないモバイルブロードバンドの接続タイプ。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "モバイルブロードバンドプロバイダーのタイプを選択"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3925,7 +3969,7 @@ msgstr ""
 "モバイルブロードバンドのプロバイダーが使用する技術を選択してください。不明な"
 "場合は、プロバイダーにお尋ねください。"
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用"
@@ -3933,81 +3977,79 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "なし"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s 用の PPP 認証方法を編集"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP の設定"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "プロキシー"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "プロキシーユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "エラー: ファイルに有効な JSON 設定がありません。"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "チームユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "チーム接続 %d"
@@ -4015,68 +4057,67 @@ msgstr "チーム接続 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "チームポート"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s ('%s' 経由)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "新規接続…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "vlan ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan 親"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 接続 %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' 用のエディター VPN プラグイン (%s) が見つかりませんでした。"
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "原因不明"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "VPN ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "'%s' 用の VPN プラグインが見つかりませんでした。"
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 接続 %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN 接続の種類を選んでください"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -4086,7 +4127,7 @@ msgstr ""
 "が一覧にない場合は、正しい VPN プラグインがインストールされていない可能性があ"
 "ります。"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4094,7 +4135,7 @@ msgstr ""
 "このオプションは、ここで入力された BSSID で指定された Wi-Fi アクセスポイント "
 "(AP) へこの接続をロックします。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4104,96 +4145,94 @@ msgstr ""
 "の両方で指定されたネットワークデバイスにこの接続をロックします。例: "
 "“wlan0”、“3C:97:0E:42:1A:19”、“wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi デバイス"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit キー (HEX または ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "動的 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # そういう仕様の名前なので訳すべきでない。
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。Wi-Fi 設定があ"
 "りません。"
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi セキュリティー"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "不明な SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Ad-Hoc モードとのセキュリティーの互換性がありません"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" という名前のファイルは既に存在します。"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s を、保存している VPN 接続に入れ替えたいですか ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4204,116 +4243,103 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "VPN 接続をエクスポートする..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "アンロック(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "自動的にこのデバイスをアンロックする"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "接続情報"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "有効なネットワーク接続"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "証明書セットがありません"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "キーセットがありません"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s 証明書のキーを選択する"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s プライベートキー(_K):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "%s キーパスワード(_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s 証明書を選択する"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "%s 証明書(_C):"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "私の国は一覧に有りません"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "一覧に無い"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "プランが一覧にありません..."
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "国や地域"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM デバイスがインストールされています"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA デバイスがインストールされています"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "すべてのデバイス"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新規のモバイルブロードバンド接続"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4321,83 +4347,69 @@ msgstr ""
 "このアシスタントを使用すると、携帯 (3G) ネットワークへのモバイルブロードバン"
 "ド接続が簡単にできます。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "以下の情報が必要です:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "使用するブロードバンドプロバイダー名"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "使用するブロードバンド請求書プラン名"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(一部のケースで) ブロードバンド請求書プラン APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "このモバイルブロードバンドデバイス用の接続を作成(_T):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "モバイルブロードバンド接続のセットアップ"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "国や地域の一覧:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "国や地域"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "プロバイダーの国や地域を選択"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "プロバイダーを一覧から選択(_L):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "プロバイダーが見つからないので手動で入力します(_M):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "私のプロバイダーは GSM 技術 (GPRS, EDGE, UMTS, HSPA) を使用します"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "私のプロバイダーは CDMA 技術 (1xRTT, EVDO) を使用します"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "使用プロバイダーを選択"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "使用プランの選択(_S):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "選択した APN (Access Point Name)(_A):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4410,37 +4422,31 @@ msgstr ""
 "ご自分のプランが分からない場合は、そのプランの APN についてプロバイダーにお尋"
 "ねください。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "使用する請求書プランを選択"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "ご使用のモバイルブロードバンド接続は、以下のように設定されています。"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "使用デバイス:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "使用プロバイダー:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "使用プラン:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4453,141 +4459,140 @@ msgstr ""
 "ください。モバイルブロードバンド設定を変更するには、システム → 設定メニューか"
 "ら「ネットワーク接続」を選択します。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "モバイルブロードバンドセッティングを確定する"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(なし)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "%s 内のキー"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s 内の 証明書"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(不明)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "選択"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "ファイルから選択…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "%s  証明書を選択する"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
 msgid "%s certificate _password"
 msgstr "%s 証明書のパスワード(_P):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "ログインでエラー: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "セッションの開始でエラー: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "トークンをアンロック(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "発行"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s PIN を入力"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "ログイン(_L)"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "PIN を記憶する(_R)"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "このユーザーのパスワードのみ保存する"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "すべてのユーザーのパスワードを保存する"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "毎回このパスワードを要求する"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "パスワードは不要です"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "パスワードを表示(_O)"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "第 3 のパスワード(_T):"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "セカンダリーパスワード(_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "クリックして接続する"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "新規…"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "なし"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "動的 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "作成(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4595,81 +4600,89 @@ msgstr ""
 "Wi-Fi ネットワーク '%s' にアクセスするには、パスワードか暗号化キーが必要で"
 "す。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ネットワークの認証が必要です"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ネットワークでは認証が要求されます"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "新しい Wi-Fi ネットワークを作成"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新規 Wi-Fi ネットワーク"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "作成する Wi-Fi ネットワークの名前を入力してください。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "非表示 Wi-Fi ネットワークに接続する"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "非表示 Wi-Fi ネットワーク"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。"
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
 msgid "Wi-Fi _security"
 msgstr "Wi-Fi セキュリティー(_S):"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
 msgid "C_onnection"
 msgstr "接続(_O):"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
 msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi アダプター(_A):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "プロバイダーが見つからないので手動で入力します(_M):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "プロバイダー:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "国や地域の一覧:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "国や地域"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "有線"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4679,13 +4692,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4693,27 +4706,27 @@ msgstr ""
 "パスワードが見つからない、もしくは接続が無効です。無効の場合は、まず nm-"
 "connection-editor で接続を編集する必要があります。"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi セキュリティー(_S):"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "ネットワーク名(_N):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "接続(_O):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi アダプター(_A):"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "使用法:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4721,7 +4734,7 @@ msgstr ""
 "このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) のコンポーネントです。"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4729,352 +4742,350 @@ msgstr ""
 "コマンドラインでの利用は意図されていません。代わりに GNOME デスクトップ環境で"
 "実行します。"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "有効になっていません"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "登録されていません"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ホームネットワーク (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ホームネットワーク"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "検索中"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "登録は拒否されました"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ローミング)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ローミング)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ローミングネットワーク (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ローミングネットワーク"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM カード '%s' の PIN コード ('%s' に搭載)"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドデバイスには PIN コードが必要です"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "モバイルブロードバンド接続 '%s' はアクティブです: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ローミング"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s 接続"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM 証明書 (*.pem、*.crt、*.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER か、PEM、 PKCS#12 のプライベートキー (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X セキュリティーで未定義のエラー (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "CA 証明書が選択されていません"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "選択された CA 証明書ファイルは存在しません"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC ファイルがありません"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "PAC ファイルを選択"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "認証"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "両方"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名の識別子(_M):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC ファイル(_F):"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "内部認証(_I):"
 
 # see http://www.cisco.com/cisco/web/support/JP/100/1005/1005630_eapfast-wlc-rad-config.html#PAC
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動 PAC プロビジョニングを許可(_V)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP ユーザー名がありません"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP パスワードがありません"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "バージョン 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "バージョン 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA 証明書は必要ありません(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP バージョン(_V):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "サーバー証明書名のサフィックス"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 #, fuzzy
 msgid "_Domain"
 msgstr "ドメイン(_D):"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "EAP ユーザー名がありません"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "EAP パスワードがありません"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "パスワードを表示(_O)"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS アイデンティティーがありません"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "ユーザー証明書が選択されていません"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "選択されたユーザー証明書ファイルは存在しません"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "キーが選択されていません"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "選択されたキーファイルは存在しません"
 
 # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。
 # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証)
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
 msgid "I_dentity"
 msgstr "アイデンティティー(_D):"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (非 EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X セキュリティーの検証中に原因不明のエラー"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
 msgid "Au_thentication"
 msgstr "認証(_T):"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "leap-username が見つかりません"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "leap-password が見つかりません"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-key が見つかりません"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無効な wep-key: %zu の長さのキーには、16 進数しか使用できません"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使用できません"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5083,41 +5094,41 @@ msgstr ""
 "無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) "
 "か 10/26 (hex) にする必要があります"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無効な wep-key: パスフレーズを空白にすることはできません"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無効な wep-key: パスフレーズは 64 文字未満にする必要があります。"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "オープンシステム"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共有鍵"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (デフォルト)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
 msgid "_Key"
 msgstr "キー(_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "キーを表示(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP インデックス(_X):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5126,15 +5137,24 @@ msgstr ""
 "無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で "
 "64 桁にする必要があります"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
 msgid "_Type"
 msgstr "タイプ(_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (デフォルト)"
+
+#~ msgid "Ignored"
+#~ msgstr "無視"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "有効なネットワーク接続"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "不明なエラーのため、接続シークレットを更新できませんでした。"
 
diff --git a/po/kk.po b/po/kk.po
index 785b8b10..4cadd974 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-07-26 11:30+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-08-26 08:42+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -19,49 +19,58 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Желі"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Желілік байланыстарыңызды басқару"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Желілік байланыстар"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Шикі баптаулар"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Сіздің желілік байланысыңызды басқару мен түзету"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Байланысты орнату хабарламаларын сөндіру"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Желіге байланысты орнатқан кезде хабарламаларды сөндіру үшін бұны true етіп "
 "орнатыңыз."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Байланысты ажырату хабарламаларын сөндіру"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Желімен байланыс ажыратылған кезде хабарламаларды сөндіру үшін бұны true "
 "етіп орнатыңыз."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN хабарламаларын сөндіру"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -69,67 +78,68 @@ msgstr ""
 "VPN-ге байланыс орнатылған не ажыратылған кезде хабарламаларды сөндіру үшін "
 "бұны true етіп орнатыңыз."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Қолжетерлік желілер туралы хабарламаларды басу"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "Wi-Fi желілері қолжетерлік болу туралы хабарламаларды сөндіру."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi жасауды сөндіру"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Апплетті қолданған кезде adhoc желілерін жасауды сөндіру үшін бұны true етіп "
 "орнатыңыз."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Хабарлау өрісінде апплетті көрсету"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA сертификатын елемеу"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager байланыстар түзеткіші"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -137,7 +147,7 @@ msgstr ""
 "NetworkManager - бұл жүйелік байланыстарды және құрылғыларды басқару және "
 "баптауға арналған жүйелік қызмет."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -145,118 +155,117 @@ msgstr ""
 "nm-connection-editor бағдарламасы NetworkManager-мен бірге NetworkManager "
 "үшін байланыс профильдерін жасауға және түзетуге жұмыс істейді."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager жасағандар"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X аутентификациясы"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1068
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Ба_йланысу"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "Желі а_тауы"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "қауіпсіз."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Байланысты қосу/белсендіру мүмкін емес"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Белгісіз қате"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Байланысты орнату сәтсіз"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Құрылғыны ажырату сәтсіз"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Ажырату сәтсіз"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Байланысты іске қосу сәтсіз"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Бұл хабарламаны келесіде көрсетпеу"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +275,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы желілік байланыс үзілген соң ажыратылды."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +285,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені желілік байланыс үзілді."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +294,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені VPN қызметі күтпегенде тоқтады."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +304,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені VPN қызметі қате баптауларды қайтарды."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +313,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені байланысты орнатудың күту уақыты бітті."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -313,7 +322,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені VPN қызметі уақытында іске қосылмады."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +331,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені VPN қызметі іске қосыла алмады."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -331,7 +340,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені жарамды VPN парольдері табылмады."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +349,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз, өйткені VPN парольдері жарамсыз."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +358,7 @@ msgstr ""
 "\n"
 "\"%s\" VPN байланысы сәтсіз."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -360,19 +369,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN байланысы сәтті орнатылды.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN кіру хабарламасы"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN байланысы сәтсіз"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -385,7 +394,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -398,562 +407,574 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "құрылғы дайын емес (firmware жоқ)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "құрылғы дайын емес"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "байланыспаған"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Байланысты үзу"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "құрылғы басқарылмайды"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Бірді-бір желілік құрылғы қолжетерсіз"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN байланыстары"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPN ба_птау…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "VPN байланысын қ_осу…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager орындалып тұрған жоқ…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Желі сөндірілген"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Ж_еліні іске қосу"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi-ды і_ске қосу"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Мобильді кеңжолақты желіні іске қосу"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Хабарламаларды іске қосу"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Байла_ныс ақпараты"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Байланыстарды түзету…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "Осы т_уралы"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "\"%s\" желісіне байланыс орнатылды."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Ажыратылған"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Желілік байланыс ажыратылды."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "\"%s\" желілік байланысын дайындау…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "\"%s\" желілік байланысы үшін пайдаланушы аутентификациясы керек…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "\"%s\" үшін желілік адресті сұрау…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "\"%s\" желілік байланысы белсенді"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "\"%s\" VPN байланысын іске қосу…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "\"%s\" VPN байланысы үшін пайдаланушы аутентификациясы керек…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "\"%s\" үшін VPN адресін сұрау…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN байланысы белсенді"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Желілік байланыстар жоқ"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager апплеті"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK коды қате; провайдеріңізге хабарласыңыз."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN коды қате; провайдеріңізге хабарласыңыз."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Босату кодын жіберу…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобильді кеңжолақты (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобильді кеңжолақты"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Қолжетерлік"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Жаңа мобильді кеңжолақты байланысы…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Байланыс орнатылды"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Сіз мобильді кеңжолақты желісіне байланыс орнаттыңыз."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Мобильді кеңжолақты желісі."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Сіз үй желісінде тіркелдіңіз."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Сіз роуминг желісінде тіркелдіңіз."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Сіз мобильді кеңжолақты желісіне байланыс орнаттыңыз."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "\"%s\" мобильді кеңжолақты байланысын дайындау…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "\"%s\" мобильді кеңжолақты байланысын баптау…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "\"%s\" мобильді кеңжолақты байланысы үшін пайдаланушы аутентификациясы керек…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "\"%s\" мобильді кеңжолақты байланысы белсенді"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Авто Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet желілері (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet желісі (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet желілері"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet желісі"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Сіз ethernet желісіне байланысқансыз."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "\"%s\" ethernet желілік байланысын дайындау…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "\"%s\" ethernet желілік байланысын баптау…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "\"%s\" ethernet желілік байланысы үшін пайдаланушы аутентификациясы керек…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "\"%s\" үшін ethernet желілік адресін сұрау…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "\"%s\" ethernet желілік байланысы белсенді"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL аутентификациясы"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Жасырын Wi-Fi желісіне байланы_су…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "_Жаңа Wi-Fi желісін жасау…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ешнәрсе)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Жаңа байланысты қосу мүмкін емес"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Рұқсаттар жеткіліксіз."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi желілері (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi желісі (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi желі(лер)"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi сөндірілген"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi құрылғы қосқышымен сөндірілген"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Көбірек желілер"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi желілері қолжетерлік"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi желісіне байланысты орнату үшін желі мәзірін қолданыңыз"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "\"%s\" Wi-Fi желісіне байланыс орнатылды."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "\"%s\" Wi-Fi желілік байланысын дайындау…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "\"%s\" Wi-Fi желі байланысын баптау…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "\"%s\" Wi-Fi желісі үшін пайдаланушы аутентификациясы керек…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "\"%s\" үшін Wi-Fi желілік адресті сұрау…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "\"%s\" Wi-Fi желілік байланысы белсенді: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "\"%s\" Wi-Fi желілік байланысы белсенді"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Байланысты белсендіру мүмкін емес"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Байланыс ақпаратын көрсету сәтсіз:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамикалық WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Көбірек адрестер"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (бастапқы)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Белгісіз"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP адресі"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Кең таратылым адресі"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Ішкі желі маскасы"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Біріншілік"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Екіншілік DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Үшінші DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Жалпы"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Құрылғы адресі"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Жылдамдық"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Қауіпсіздік:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Бастапқы маршрут"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Елемеу"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Қатынау нүктесі"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN түрі"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN шлюзі"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN пайд. аты"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN баннері"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Негізгі байланыс"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Белгісіз"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Дұрыс белсенді байланыстар табылмады!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -964,21 +985,21 @@ msgstr ""
 "және көптеген басқа қоғамдастық үлес қосушылары\n"
 "және аудармашылар"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Желілің құрылғылар мен байланыстарды басқару үшін хабарлау аймағының апплеті."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager веб сайты"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -986,33 +1007,33 @@ msgstr ""
 "NetworkManager апплеті кейбір міндетті ресурстарды таба алмаған (.ui файлы "
 "табылмады)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Ресурстар жоқ"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Мобильді кеңжолақты желісінің паролі"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "\"%s\" үшін байланысты орнату үшін пароль керек."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM үшін PIN босатуы керек"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM үшін PIN босатуы керек"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1022,25 +1043,25 @@ msgstr ""
 "керек."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN коды:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN кодын көрсету"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM үшін PUK босатуы керек"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM үшін PUK босатуы керек"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1050,41 +1071,41 @@ msgstr ""
 "керек."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK коды:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Жаңа PIN коды:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Жаңа PIN кодын қайталау:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK кодтарын көрсету"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Байланыста VPN баптауы жоқ"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "VPN UI ішіне байланысты жазу сәтсіз: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1092,41 +1113,41 @@ msgstr ""
 "IP адрестері компьютеріңізді желіде сипаттайды. IP адресін қосу үшін, \"Қосу"
 "\" батырмасын басыңыз."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "Қо_су"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "Ө_шіру"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Автоматты түрде  алынған маршруттарды еле_меу"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Бұл байланысты тек ол өзі жатқан желі ішіндегі ресурстар үшін қ_олдану"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1134,15 +1155,15 @@ msgstr ""
 "Іске қосулы болса, бұл байланыс үнсіз келісім бойынша қолданылатын желілік "
 "байланыс ретінде ешқашан қолданылмайтын болады."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "Жа_сау…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Байланыс түрін таңдаңыз"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1150,209 +1171,221 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "Құр_ылғы"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Кең таратылым"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ұсынылады)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "А_грегацияланған (bond) байланыстары"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "Реж_имі"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "Түз_ету"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Бақылау ж_иілігі"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "мс"
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "_Интерфейс аты"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "Бай_ланысты бақылау"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "Біріншілік"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байт"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Приоритеті"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "А_грегацияланған (bridge) байланыстары"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1360,303 +1393,343 @@ msgid ""
 "frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматты"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "бастапқы"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "көрсетілмеген қате"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Сақтау"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Тұрақты"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC адресі"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Құрылғылық адресі"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "жарамсыз %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "интерфейс аты қате (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "құрылғы атын талдау мүмкін емес"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "құрылғылық адресі қате"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "жарамсыз %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "құрылғы"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "жарамсыз %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Бұл байланыс үшін Data Center Bridging (DCB) қол_дану"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Ағынды басқару"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Мүмкіндік"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Іске қосу"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Жарнамалау"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Приоритеті"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Опциялар…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Приоритет топтары"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Трафик класы"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "Priority"
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "_Пайдаланушы аты"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "Қы_змет"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Пар_ольді көрсету"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "PPP _интерфейсі"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Аталық интерфейсі"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
-#| msgid "_Parent interface:"
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1664,190 +1737,182 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматты"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Еспе жұп (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "AUI интерфейсі"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "MII интерфейсі"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Жарты"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Толық"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Елемеу"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Қолмен"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Порт"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "Құр_ылғы"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "Кл_ондалған MAC адресі"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Ба_стапқы"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "Еле_меу"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "К_ең таратылым"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-#| msgid "Sh_ow passwords"
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "Ж_ылдамдық"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Дупле_кс"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Иә"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Жоқ"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Бұл желіге барлық па_йдаланушылар байланыса алады"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "VPN-ге а_втобайланысу"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "Файрволл _зонасы"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "Өл_шенетін байланыс"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1855,19 +1920,18 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
-#| msgid "Connect _automatically"
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 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.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1876,7 +1940,7 @@ msgstr ""
 "адрестеріне қосымша түрде статикалық адрестерді баптау үшін, \"Қосу\" "
 "батырмасын басыңыз."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1888,1488 +1952,1482 @@ msgstr ""
 "батырмасын басыңыз. Егер адресі көрсетілмесе, аумақ автоматты түрде "
 "анықталатын болады."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Қосымша статикалық адрестер"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адрестер"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Адрес (міндетті емес)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Байланысқан"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Құрылғы аты"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Аталық құрылғысы"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Режимі"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Жергілікті IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Қашықтағы IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматты, DNS баптаулары қолмен көрсетіледі"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Басқа компьютерлермен бөліскен"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "Тә_сіл"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "І_здеу домендері"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "DNS _серверлері"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Маршруттар…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Сөндірулі"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Іске қосылған (публикалық адресті қалау)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Іске қосылған (уақытша адресті қалау)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Тұрақты жекелік"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Тексеру"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Қатаң"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Кілттер"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Параметрлер"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Растау"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI порты"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Шифрлеу"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Қарапайым"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Нө_мірі"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Кеңейтілген"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Ж_елі ID"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Ауыстыру…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Үй желісі қолжетерсіз болған кезде, _роумингті қолдануға рұқсат ету"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Пар_ольдерді көрсету"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Рұқсат етілген тәсілдер"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Тә_сілдерді баптау…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Сығу"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128 биттік шифрлеуді _талап ету"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Скриптті файлдан импорттау…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Тәсіл"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Кеңе_йтілген…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Ethernet порт қалып-күйі"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Порт приоритеті"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "LACP п_орт приоритеті"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "LACP порт _кілті"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 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:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Агрегацияланған (team) баптауларын файлдан _импорттау…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "JSON баптауларын тү_зету"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Шикі баптаулар"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Порт приоритеті"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Team құрылғысынан"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "А_грегацияланған (team) байланыстары"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Кез келген L3 хаттамасы"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Кез келген L4 хаттамасы"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "Құр_ылғылық адресі"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Құр_ылғылық адрес саясаты"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Жүйе приоритеті"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Аталық интерфейсі"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "VLAN интер_фейсінің аты"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Клондалған MAC _адресі"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN _id"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Жалаушалар"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Құрылғы аты + нөмірі"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + нөмірі"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Қауі_псіздік"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Клиент"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Қатынау нүктесі"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Мб/с"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "Ар_на"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Рұқсат етілген аутентификация тәсілдері"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Кеңейтілген аутентификация тәсілі"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Парольмен аутентификация тәсілі"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Агрегацияланған (Team)"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Көпір"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP туннелі"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "VPN плагині VPN байланысын дұрыс импорттай алмады: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Импорттау үшін файлды таңдаңыз"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Ашу"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Құрылғы"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Виртуалды"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Сақталған VPN баптауын импорттау…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Жаңа байланысты жасау мүмкін емес"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Байланысты өшіру мүмкін емес"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s байланысын өшіруді шынымен қалайсыз ба?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Жаңа байланыс"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Желілік маскасы"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s түзету"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Атаусыз байланысты түзету"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Байланыс аты жоқ"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Түзеткіш іске қосылуда…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Байланысты түзету мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "%s қате қасиеті: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Сақтау"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Бұл байланысқа жасалған өзгерістерді сақтау."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Бұл машинадағы барлық пайдаланушылары үшін сақтауға аутентификациядан өту."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Байланысты жасау мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Байланысты түзету мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 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:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Түзеткішті іске қосу қатесі"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Байланысты қосу сәтсіз"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Түзеу"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Байланыс а_ты"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Экспорт…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Файл аты"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ешқашан"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "қазір"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d минут бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d сағат бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d күн бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ай бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d жыл бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Байланысты өшіру мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Түзету үшін байланысты таңдаңыз"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Өшіру үшін байланысты таңдаңыз"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Аты"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Соңғы рет қолданылған"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Таңдалған байланысты түзету"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Таңдалған байланысты түзету үшін аутентификациядан өтіңіз"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Таңдалған байланысты өшіру"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Таңдалған байланысты өшіру үішн аутентификациядан өтіңіз"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Белгісіз байланыс түрі"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "\"%s\" байланыстарын импорттау тәсілі белгісіз"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Байланысты импорттау қатесі"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Байланысты жасау қатесі"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Байланыс түрі көрсетілмеген."
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "VPN плагиндері орнатылмаған."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "\"%s\" байланыстарын жасау жолы белгісіз"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Байланысты түзету қатесі"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID \"%s\" байланысы табылмады"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Желілік байланыстар"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Жаңа байланысты қосу"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X қауіпсіздігі"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X қауіпсіздігінің пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Бұл байланыс үшін 802.1X қауіпсі_здігін қолдану"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "жарамсыз Bluetooth құрылғысы (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth байланысы %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth түрі"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "біріншілік"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
@@ -3377,88 +3435,87 @@ msgstr ""
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "аталық интерфейсі жоқ"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL байланысы %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "елемейтін"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet құрылғысы"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "клондалған MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet байланысы %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:806
-#: ../src/libnm-gtk/nm-mobile-providers.c:805
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Бастапқы"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Жалпы пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3466,193 +3523,185 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband құрылғысы"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand байланысы %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 туннелі пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP туннелі байланысы %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Автоматты (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматты (VPN), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Автоматты, тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Автоматты (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматты (PPPoE), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Автоматты (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматты (DHCP), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Тек Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Қосымша DNS _серверлері"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Қосымша і_здеу домендері"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s үшін IPv4 маршруттарын түзету"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 баптаулары"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "\"%s\" IPv4 адресі жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "\"%s\" IPv4 адрестің желілік маскасы жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "\"%s\" IPv4 шлюзі жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "\"%s\" IPv4 DNS сервері жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Автоматты, тек DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s үшін IPv6 маршруттарын түзету"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 баптаулары"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "\"%s\" IPv6 адресі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "\"%s\" IPv6 адрес префиксі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "\"%s\" IPv6 шлюзі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "\"%s\" IPv6 DNS сервері жарамсыз"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "MACsec пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACsec байланысы %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Мобильді кеңжолақты байланыстардың пайдаланушы интерфейсін жүктеу мүмкін "
 "емес."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Қолдауы жоқ мобильді кеңжолақты байланыс түрі."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Мобильді кеңжолақты провайдер түрін таңдаңыз"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3660,7 +3709,7 @@ msgstr ""
 "Сіздің мобильді кеңжолақты провайдеріңіз қолданатын технологияны таңдаңыз. "
 "Білмесеңіз, провайдеріңізден сұраңыз."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Менің провайдерім GSM не_гізіндегі технологияны қолдануда (мыс. GPRS, EDGE, "
@@ -3668,79 +3717,79 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Менің провайдерім CDMA негізін_дегі технологияны қолдануда (мыс. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ешнәрсе"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s үшін PPP аутентификация тәсілдерін түзету"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP баптаулары"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Прокси пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Қате: файлда жарамды JSON баптаулары жоқ"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Агрегацияланған (Team) пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Агрегацияланған (Team) байланысы %d"
@@ -3748,11 +3797,11 @@ msgstr "Агрегацияланған (Team) байланысы %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Агрегацияланған (Team) порты"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr ""
 "Агрегацияланған (Team) порттың пайдаланушы интерфейсін жүктеу мүмкін емес."
@@ -3760,165 +3809,162 @@ 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (\"%s\" арқылы)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Жаңа байланыс…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Vlan пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN байланысы %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "\"%s\" үшін VPN түзеткіші плагинін жүктеу мүмкін емес (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "белгісіз қате"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "VPN пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "\"%s\" үшін VPN плагині табылмады."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN байланысы %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN байланысының түрін таңдаңыз"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi құрылғысы"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi байланысы %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 биттік кілті (Hex не ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 биттік кілттік фразасы"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамикалы WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi қауіпсіздігінің пайдаланушы интерфейсін жүктеу мүмкін емес: Wi-Fi "
 "баптауы жоқ."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi қауіпсіздігі"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi қауіпсіздігінің пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "SSID жоқ"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" аты бар файл бар болып тұр."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s орнына сіз сақтаймын деген VPN байланысын сақтау керек пе?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN байланысын экспорттау мүмкін емес"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3929,203 +3975,171 @@ msgstr ""
 "\n"
 "Қате: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "VPN байланысын экспорттау…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Бо_сату"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Бұл құрылғыны блоктаудан автоматты түрде босату"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Байланыс ақпараты"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Жабу"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Белсенді желілік байланыстары"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Сертификат көрсетілмеген"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Кілт көрсетілмеді"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s сертификаты үшін кілтті таңдаңыз"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "%s жеке _кілті"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "%s кілт _паролі"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s сертификатын таңдаңыз"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _сертификаты"
 
-#: ../src/libnma/nma-mobile-wizard.c:281
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Менің елім көрсетілмеген"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Тізілмеген"
 
-#: ../src/libnma/nma-mobile-wizard.c:465
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Менің жоспарым тізімде жоқ…"
 
-#: ../src/libnma/nma-mobile-wizard.c:626
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Провайдер"
 
-#: ../src/libnma/nma-mobile-wizard.c:908
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Ел не аймақ"
-
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Менің елім көрсетілмеген"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Орнатылған GSM құрылғысы"
 
-#: ../src/libnma/nma-mobile-wizard.c:1002
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Орнатылған CDMA құрылғысы"
 
-#: ../src/libnma/nma-mobile-wizard.c:1208
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Кез-келген құрылғы"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Жаңа мобильді кеңжолақты байланысы"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Сізге келесі ақпарат керек болады:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Бұ_л мобильді кеңжолақты құрылғы үшін байланысты жасау:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Мобильді кеңжолақты байланысты орнату"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Ел не аймақтар тізімі:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Ел не аймақ"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Провайдеріңіздің ел не аймағын таңдаңыз"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Өз провайдеріңізді тізі_мнен таңдаңыз:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Менің провайдерім GSM қолдануда (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Менің провайдерім CDMA қолдануда (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Провайдер:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Провайдеріңізді таңдаңыз"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Жоспарыңызды таң_даңыз:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4133,37 +4147,31 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan’s APN."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Төлеу жоспарын таңдаңыз"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Сіздің мобильді кеңжолақты байланысыңыз келесі баптаулармен бапталған:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Құрылғыңыз:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Провайдеріңіз:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Жоспарыңыз:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4172,183 +4180,174 @@ msgid ""
 "Preferences menu."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Мобильді кеңжолақты баптауларын растау"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Ешнәрсе)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "%s ішіндегі кілт"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s ішіндегі сертификаты"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Белгісіз)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Таңдау"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Бас тарту"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Файлдан таңдау…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "%s сертификатын таңдау"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "%s сертификат _паролі"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Кіру қатесі: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Сессияны ашу қатесі: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "Токенді бо_сату"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Шығарған"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s PIN кодын енгізіңіз"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Кіру"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "PIN кодын _есте сақтау"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Парольді тек бұл пайдаланушы үшін сақтау"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Парольді барлық пайдаланушылар үшін сақтау"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Әр рет бұл парольді сұрап отыру"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Пароль керек емес"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Пар_ольдерді көрсету"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Ү_шіншілік пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "Қо_сымша пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Байланысу үшін шертіңіз"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Пароль жоқ болып тұр, немесе байланыс жарамсыз болып тұр. Егер жарамсыз "
-"болса, алдымен байланысты nm-connection-editor көмегімен түзетуіңіз керек"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Жаңа…"
 
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамикалық WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Жаса_у"
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "\"%s\" Wi-Fi желісіне байланысу үшін пароль не шифрлеу кілттері керек."
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi желі аутентификациясы керек"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi желісі үшін аутентификация керек"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Жаңа Wi-Fi желісін жасау"
 
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Жаңа Wi-Fi желісі"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Жасалатын Wi-Fi желісінің атын енгізіңіз."
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Жасырын Wi-Fi желісіне байланысу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Жасырын Wi-Fi желісі"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4356,35 +4355,51 @@ msgstr ""
 "Байланысты орнатқыңыз келетін Wi-Fi жасырын желісінің атын мен қауіпсіздік "
 "ақпаратын енгізіңіз."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Wi-Fi қауі_псіздігі"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "Ба_йланыс"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi _құрылғысы"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Өз провайдерімді таба алмадым, оны қол_мен енгіземін:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Ел не аймақтар тізімі:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Ел не аймақ"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Сымды"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC желісі"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4394,33 +4409,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Пароль жоқ болып тұр, немесе байланыс жарамсыз болып тұр. Егер жарамсыз "
+"болса, алдымен байланысты nm-connection-editor көмегімен түзетуіңіз керек"
+
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi қауі_псіздігі:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "Желі а_тауы:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "Ба_йланыс:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi _құрылғысы:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Қолданылуы:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4428,333 +4451,349 @@ msgstr ""
 "Бұл бағдарлама NetworkManager құрамасы болып табылады (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "Командалық жол режимінде емес, GNOME жұмыс үстел ортасында жұмыс істейді."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "іске қосылмаған"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "тіркелмеген"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Үй желісі (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Үй желісі"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "іздеу"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "тіркелу тайдырылған"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s роуминг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роуминг желісі (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Роуминг желісі"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "\"%s\" SIM картасы үшін PIN коды, \"%s\" жерінде"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN коды керек"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Мобильді кеңжолақты құрылғы үшін PIN коды керек"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "\"%s\" мобильді кеңжолақты байланысы белсенді: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s байланысы"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM сертификаттары (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, не PKCS#12 жеке кілттері (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X қауіпсіздігі (wpa-eap) ішіндегі анықталмаған қате"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "СО сертификаты таңдалмады"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "таңдалған СО сертификат файлы жоқ болып тұр"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC файлы жоқ"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "PAC файлын таңдаңыз"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC файлдары (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Барлық файлдар"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимды"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Аутентификациядан өткен"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Екеуі де"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "А_нонимды аутентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "PAC фа_йлы"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "І_шкі аутентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Автоматты PAC ұсы_нуды рұқсат ету"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP пайдаланушы аты жоқ"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP паролі жоқ"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Нұсқасы 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Нұсқасы 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA сертификаты керек е_мес"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "_PEAP нұсқасы"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Домен"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "EAP пайдаланушы аты жоқ"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "EAP паролі жоқ"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 биттік кілттік фразасы"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Пар_ольдерді көрсету"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS identity жоқ"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "пайдаланушы сертификаты таңдалмады"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "таңдалған пайдаланушы сертификат файлы жоқ болып тұр"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "кілт таңдалмады"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "таңдалған кілттер файлы жоқ болып тұр"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP жоқ)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X қауіпсіздігін тексерудің белгісіз қатесі"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Туннельденген TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Қорғалған EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "Аутент_ификация"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "leap-username жоқ"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "leap-password жоқ"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-key жоқ"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "жарамсыз wep-key: ұзындығы %zu кілт ішінде тек оналтылық сандар болуы тиіс"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 "жарамсыз wep-key: ұзындығы %zu кілт ішінде тек ascii таңбалары болуы тиіс"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4763,39 +4802,39 @@ msgstr ""
 "жарамсыз wep-key: кілт ұзындығы %zu қате. Кілт ұзындығы 5/13 (ascii) немесе "
 "10/26 (оналтылық) болуы тиіс"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "жарамсыз wep-key: кілттік фраза бос емес болуы тиіс"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "жарамсыз wep-key: кілттік фраза 64 таңбадан аз болуы тиіс"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ашық жүйе"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Ортақ кілт"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Бастапқы)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "Кі_лт"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Кіл_тті көрсету"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP и_ндексі"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4804,16 +4843,25 @@ msgstr ""
 "жарамсыз wpa-psk: кілт ұзындығы %zu жарамсыз. Ол [8,63] байт немесе 64 "
 "оналтылық сан болуы тиіс"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "жарамсыз wpa-psk: 64 байты бар кілтті он алтылық кілт ретінде талдау мүмкін "
 "емес"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Түрі"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (бастапқы)"
+
+#~ msgid "Ignored"
+#~ msgstr "Елемеу"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Белсенді желілік байланыстары"
+
 #~ msgid "Priority:"
 #~ msgstr "Приоритеті:"
 
@@ -5120,12 +5168,6 @@ msgstr "_Түрі"
 #~ msgid "GSM network."
 #~ msgstr "GSM желісі."
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Екіншілік DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Үшінші DNS:"
-
 #~ msgid "Any"
 #~ msgstr "Кез-келген"
 
diff --git a/po/km.po b/po/km.po
index 7e426e7f..d5f49e61 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po_nm-applet-km\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-04-23 15:44+0700\n"
 "Last-Translator: Sophea Sok <sophea@open.org.kh>\n"
 "Language-Team: Khmer <>\n"
@@ -21,225 +22,248 @@ msgstr ""
 "X-Generator: WordForge 0.8 RC1\n"
 "X-Language: km-KH\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "បណ្ដាញ"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "គ្រប់គ្រង​ការ​តភ្ជាប់បណ្ដាញ​របស់​អ្នក"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "ការ​តភ្ជាប់​បណ្ដាញ"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "ការ​តភ្ជាប់​បណ្ដាញ​សកម្ម"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "គ្រប់គ្រង និង​ផ្លាស់ប្ដូរ​ការ​កំណត់​ការ​ភ្ជាប់​បណ្ដាញ​របស់​អ្នក"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​តភ្ជាប់"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់​បណ្ដាញ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "បិទ​ការ​ជូនដំណឹង​ដែល​បាន​ផ្ដាច់"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ផ្ដាច់​ពី​បណ្ដាញ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "បិទ​ការ​ជូនដំណឹង VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង​នៅ​ពេល​ភ្ជាប់ ឬ​ផ្ដាច់​ពី VPN ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "លាក់​​​ការ​ជូនដំណឹង​បណ្ដាញ​ដែល​មាន"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ជូនដំណឹង នៅ​ពេល​មាន​បណ្ដាញ​វ៉ាយហ្វាយ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "តែម"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "ត្រូវ​បាន​ប្រើ ដើម្បី​កំណត់​ថា​តើ​គួរតែ​ប្ដូរ​ការ​កំណត់​ទៅ​ជា​កំណែ​ថ្មី​ដែរ​ឬ​ទេ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "បិទ​ការ​បង្កើត​វ៉ាយហ្វាយ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "កំណត់​ទៅ​ពិត​ដើម្បី​បិទ​ការ​បង្កើត​បណ្ដាញ adhoc នៅ​ពេល​ប្រើ​អាប់ភ្លេត។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "កំណត់​ទៅ​មិន​ពិត ដើម្បី​បិទ​ការ​បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "មិន​អើពើ​វិញ្ញាបនបត្រ CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ដំណាក់កាល​ទី ២ នៃ​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "អាប់ភ្លេត NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "មិនមាន​ការ​តភ្ជាប់​បណ្ដាញ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "អាប់ភ្លេត NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់ 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "បាន​តភ្ជាប់"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "ឈ្មោះ​បណ្ដាញ៖"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "បណ្ដោះ​អាសន្ន"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "សុវត្ថិភាព ។"
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម/ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "មិន​ស្គាល់​កំហុស"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "ការ​តភ្ជាប់​បាន​បរាជ័យ"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់​ឧបករណ៍"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "ការ​ផ្ដាច់​បាន​បរាជ័យ"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "កុំ​បង្ហាញ​សារ​នេះ​ម្ដងទៀត"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -249,7 +273,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​ដាច់ ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​ជាប់​គាំង។"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -259,7 +283,7 @@ msgstr ""
 "\n"
 "ការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​កាត់​ជាប់​គាំង។"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN ត្រូវ​បាន​បញ្ឈប់​ដោយ​មិន​បាន​រំពឹង។"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "ការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN បាន​បញ្ជូន​ត្រឡប់​នូវ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​មិន​"
 "ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​អស់​ពេល​ក្នុង​ការ​តភ្ជាប់។"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +321,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN មិន​បាន​ចាប់ផ្ដើម​ទាន់ពេលវេលា។"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +330,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម។"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +339,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារមិន​មាន​ពាក្យសម្ងាត់ VPN ​ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​ពាក្យសម្ងាត់ VPN មិន​ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +357,7 @@ msgstr ""
 "\n"
 "ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ។"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -344,19 +368,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "បាន​បង្កើត​ការ​តភ្ជាប់ VPN ដោយ​ជោគជ័យ។\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "សារ​ចូល VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់ VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -369,7 +393,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -382,560 +406,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ឧបករណ៍​មិន​ទាន់​រួចរាល់ (បាត់​កម្មវិធី​ប​ង្កប់)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ឧបករណ៍​មិន​ទាន់​រួចរាល់"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "បាន​ផ្ដាច់"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ផ្ដាច់"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "មិន​បាន​គ្រប់គ្រង​ឧបករណ៍"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "មិនមាន​ឧបករណ៍​បណ្ដាញ"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "ការ​តភ្ជាប់ VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "កំណត់​រចនាសម្ព័ន្ធ VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "ការ​តភ្ជាប់ VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager មិន​ដំណើរការ..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​បណ្ដាញ"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "បើក​ការ​តភ្ជាប់​បណ្ដាញ"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "បើក​វ៉ាយហ្វាយ"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "បើក​រលកអាកាស​ចល័ត"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "បើក​ការ​ជូនដំណឹង"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "ព័ត៌មាន​ការ​តភ្ជាប់"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "កែសម្រួល​ការ​តភ្ជាប់..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "អំពី"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "ឥឡូវនេះ អ្នក​បាន​តភ្ជាប់​ទៅ '%s' ។"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "បាន​ផ្ដាច់"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "តំណ​ភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​ផ្ដាច់។"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "កំពុង​រៀបចំ​តភ្ជាប់​បណ្ដាញ '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "កំពុង​ស្នើ​សុំ​អាសយដ្ឋាន​បណ្ដាញ​សម្រាប់ '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ '%s' សកម្ម"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "កំពុង​ចាប់ផ្ដើម​តភ្ជាប់ VPN '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ VPN  '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "កំពុង​ស្នើសុំ​អាសយដ្ឋាន VPN សម្រាប់ '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "ការ​តភ្ជាប់ VPN '%s' សកម្ម"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "មិនមាន​ការ​តភ្ជាប់​បណ្ដាញ"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "អាប់ភ្លេត NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "កូដ PUK មិន​ត្រឹមត្រូវ សូម​ទាក់ទង​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "កូដ PIN មិន​ត្រឹមត្រូវ សូម​ទាក់ទង​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "កំពុង​ផ្ញើ​កូដ​ដោះសោ..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "រលកអាកាស​ចល័ត (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "រលកអាកាស​ចល័ត"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "មាន"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "បាន​បង្កើត​ការ​តភ្ជាប់"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅកាន់​បណ្ដាញ​រលក​អាកាស​ចល័ត។"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "បណ្ដាញ​រលកអាកាស​ចល័ត"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​ចុះឈ្មោះ​នៅ​លើ​បណ្ដាញ​ផ្ទះ។"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​ចុះឈ្មោះ​នៅ​លើ​បណ្ដាញ​រ៉ូមីង។"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ឥឡូវនេះ អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​រលក​អាកាស​ចល័ត។"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s' សកម្ម"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "អ៊ីសឺរណិត​ស្វ័យប្រវត្តិ"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​អ៊ីសឺរណិត។"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "កំពុង​​រៀប​ចំ​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "កំពុង​ស្នើសុំ​​អាសយដ្ឋាន​បណ្ដាញ​អ៊ីសឺរណិត​សម្រាប់ '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s' សកម្ម"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់ DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់​ថ្មី"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "បាន​បិទ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "វ៉ាយហ្វាយត្រូវ​បាន​បិទ​ដោយ​កុងតាក់​ផ្នែក​រឹង"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "បណ្ដាញ​ជាច្រើនទៀត"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "មាន​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ប្រើ​ម៉ឺនុយ​បណ្ដាញ​ដើម្បី​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "ឥឡូវ​អ្នក​បាន​តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ពី​អ្នកប្រើ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "កំពុង​ស្នើ​សុំ​អាសយដ្ឋាន​បណ្ដាញ​សម្រាប់​សម្រាប់ '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ%s' សកម្ម ៖ %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s' សកម្ម"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "កំហុស​ក្នុង​ការ​បង្ហាញ​ព័ត៌មាន​តភ្ជាប់៖"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP ថាមវន្ត"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "គ្មាន"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (លំនាំដើម)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "អាសយដ្ឋាន IP ៖"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "អាសយដ្ឋាន​ផ្សាយ៖"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnet Mask"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS ទីមួយ៖"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS ទីពីរ៖"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS ទីបី៖"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "អ៊ឺសឺរណិត (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ទូទៅ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ចំណុចប្រទាក់៖"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "អាសយដ្ឋាន​ផ្នែករឹង៖"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "កម្មវិធី​បញ្ជា៖"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ល្បឿន៖"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "សុវត្ថិភាព៖"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "ផ្លូវ​លំនាំដើម៖"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "មិន​បាន​អើពើ"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ពាក្យសម្ងាត់៖"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "ប្រភេទ VPN ៖"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "ផ្លូវ​ចេញចូល VPN ៖"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "ឈ្មោះ​អ្នកប្រើ VPN ៖"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "ស្លាក VPN ៖"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ការ​តភ្ជាប់គោល៖"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "រក​មិន​ឃើញ​ការ​តភ្ជាប់​សកម្ម​ដែល​ត្រឹមត្រូវ!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -943,49 +992,53 @@ msgstr ""
 "រក្សាសិទ្ធិ​ឆ្នាំ ២០០៥-២០០៨ ដោយ Novell, Inc.\n"
 "អ្នក​ចូលរួម និង​អ្នកបកប្រែ​របស់​សហគមន៍​ជាច្រើន​រូប​ទៀត"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "អាប់ភ្លេត​តំបន់​ការ​ជូនដំណឹង​សម្រាប់​គ្រប់គ្រង​ឧបករណ៍​បណ្ដាញ និង​ការ​តភ្ជាប់​របស់​អ្នក។"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "តំបន់បណ្ដាញ NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 "អាប់ភ្លេត NetworkManager មិន​អាច​​រក​ឃើញ​ធនធាន​មួយ​ចំនួន​ដែល​បាន​ទាមទារ (រក​មិន​ឃើញ​ឯកសារ .ui)។"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "បាត់​ធនធាន"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ពាក្យសម្ងាត់​របស់​បណ្ដាញ​រលកអាកាស​ចល័ត"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់​ដើម្បី​តភ្ជាប់​ទៅ '%s' ។"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -993,25 +1046,25 @@ msgid ""
 msgstr "ឧបករណ៍​រលកអាកាស​ចល័ត '%s' ទាមទារ​លេខ​កូដ SIM PIN ទើប​អាច​ប្រើ​បាន។"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "កូដ PIN ៖"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "បង្ហាញ​កូដ PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1019,35 +1072,42 @@ msgid ""
 msgstr "ឧបករណ៍​រលកអាកាស​ចល័ត '%s' ទាមទារ​លេខ​កូដ SIM PUK ទើប​អាច​ប្រើ​បាន។"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "កូដ PUK ៖"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "កូដ PIN ថ្មី៖"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "បញ្ចូល​កូដ PIN ថ្មី​ឡើងវិញ៖"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "បង្ហាញ​កូដ 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ព័ត៌មាន​តភ្ជាប់"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ការ​តភ្ជាប់ DUN៖ %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1056,56 +1116,56 @@ msgstr ""
 "អាសយដ្ឋាន IP កំណត់​អត្តសញ្ញាណ​កុំព្យូទ័រ​របស់​អ្នក​នៅ​លើ​បណ្ដាញ។ ចុច​ប៊ូតុង \"បន្ថែម\" ដើម្បី​បន្ថែម​"
 "អាសយដ្ឋាន IP ។"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "លុប"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "មិន​អើពើ​ផ្លូវ​ដែល​ទទួល​បាន​ដោយស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "ប្រើ​ការ​តភ្ជាប់​នេះ​សម្រាប់​តែ​ធនធាន​នៅ​លើ​បណ្ដាញ​របស់​វា​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "ប្រសិនបើ​បើក ការ​តភ្ជាប់​នេះ​នឹង​មិន​ត្រូវ​បាន​ប្រើ​ជា​ការ​តភ្ជាប់​បណ្ដាញ​លំនាំដើម​ឡើយ។"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "បង្កើត…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "ជ្រើស​ប្រភេទ​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1117,208 +1177,284 @@ msgstr ""
 " ប្រសិនបើ​អ្នក​កំពុង​បង្កើត​ការ​តភ្ជាប់ VPN, ហើយ​ការ​តភ្ជាប់ VPN ដែល​អ្នក​ចង់​បង្កើត​មិន​មាន​នៅ​ក្នុង​បញ្ជី​ទេ "
 "អ្នក​ប្រហែល​ជា​មិន​បាន​ដំឡើង​កម្មវិធី​ជំនួយ VPN ដែល​ត្រឹមត្រូវ។"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "សេវា៖"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "បម្រុងទុក​សកម្ម"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ផ្សាយ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "លំនឹង​ការ​ផ្ទុក​បញ្ជូន​ដែល​អាច​ប្រែប្រួល"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "លំនឹង​ការ​ផ្ទុក​ដែល​អាច​ប្រែប្រួល"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (បាន​ផ្ដល់​អនុសាសន៍)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "ការ​តភ្ជាប់ Bonded ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "របៀប៖"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "កែសម្រួល"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "ប្រេកង់​ត្រួតពិនិត្យ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ឈ្មោះ​ចំណុចប្រទាក់៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "ត្រួតពិនិត្យ​តំណ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "អាសយដ្ឋាន IP ឬ​បញ្ជី​អាសយដ្ឋាន IP បំបែក​ដោយ​សញ្ញា​ក្បៀស​ដែល​ត្រូវ​រក​មើល​នៅ​ពេល​ពិនិត្យ​ស្ថានភាព​តំណ។"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "ការ​ពន្យារពេល Link _up ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "ការ​ពន្យារពេល Link _down ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "ចម្បង៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "បៃ"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "តម្លៃ​ផ្លូវ៖"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "សុវត្ថិភាព៖"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "របៀប​ដង្កៀប​សក់៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "ការ​តភ្ជាប់​ដែល​បាន​ចង៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "ការ​ពន្យារពេល​បញ្ជូន​បន្ត៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "ពេលវេលា​ស្វាគមន៍៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "បើក​ការ​តភ្ជាប់​បណ្ដាញ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "បើក STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "អាយុ​អតិប្បរមា៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "ពេលវេលា​ក្លាយ​ជា​ចាស់៖"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "លំនាំដើម"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "បើក"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1329,193 +1465,234 @@ msgstr ""
 "តភ្ជាប់​នេះ​នឹង​ត្រូវ​បាន​ធ្វើឲ្យ​សកម្ម។  លក្ខណ​ពិសេស​នេះ​ត្រូវ​បាន​ស្គាល់​ថា​ជា​ការ​ក្លូន ឬ​ការ​ចម្លង​តាម។  "
 "ឧទាហរណ៍ ៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "ឈ្មោះ​ចំណុចប្រទាក់ VLAN៖"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "អាសយដ្ឋាន​ផ្នែករឹង៖"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ឧបករណ៍​ណាមួយ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​បច្ចុប្បន្នភាព​តភ្ជាប់​សុវត្ថិភាព ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ប្រើ Data Center Bridging (DCB) សម្រាប់​ការ​តភ្ជាប់​នេះ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "វត្ថុ​បញ្ជា​លំហូរ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "លក្ខណៈ​ពិសេស"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "បើក"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "ផ្សាយ​ពាណិជ្ជកម្ម"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "ការ​សម្រេច​ចិត្ត"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "អាទិភាព"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "ជម្រើស..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "ក្រុម​អាទិភាព"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "កំណាត់"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "អាទិភាព​វត្ថុ​បញ្ជា​លំហូរ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "បិទ ឬ​បើក​អាទិភាព​ការ​បញ្ជូន​ផ្អាក​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "អាទិភាព៖"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "ថ្នាក់​ចរាចរ៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "កម្រិត​បញ្ជូន​តឹងរ៉ឹង៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "កម្រិត​បញ្ជូន​ងាទិភាព៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "កម្រិត​បញ្ជូន​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "លេខ​សម្គាល់​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "បញ្ចូល​លេខ​សម្គាល់​ក្រុម​អាទិភាព​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1523,242 +1700,304 @@ msgstr ""
 "បញ្ចូល​ភាគរយ​កម្រិត​បញ្ជូន​នៃ​តំណ​ដែល​បាន​អនុញ្ញាត​សម្រាប់​ក្រុម​អាទិភាព​នីមួយ​ប្រើ។ ផលបូក​សរុប​នៃ​ក្រុម​ទាំងអស់​ត្រូវតែ​"
 "ស្មើ ១០០%។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "បញ្ចូល​ភាគរយ​កម្រិត​បញ្ជូន​នៃ​ក្រុម​អាទិភាព​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយ​ដែល​អាច​នឹង​ប្រើ​។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "បិទ ឬ​បើក​កម្រិត​បញ្ជូន​តឹងរ៉ឹង​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "បញ្ចូល​ថ្នាក់​ចរាចរ​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ឈ្មោះ​អ្នកប្រើ៖"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "សេវា៖"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ចំណុចប្រទាក់៖"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ចំណុចប្រទាក់​មេ៖"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ចំណុចប្រទាក់​មេ៖"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "មិន​អើពើ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ដោយដៃ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "ច្រក៖"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "សេវា៖"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "លំនាំដើម"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "មិន​អើពើ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ផ្សាយ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ល្បឿន៖"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "ការ​បញ្ជូន​ទ្វេ​ទិស"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "តភ្ជាប់​ទៅ VPN ដោយ​ស្វ័យប្រវត្តិ ពេល​ប្រើ​ការ​តភ្ជាប់​នេះ"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "គ្មាន"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "អ្នកប្រើ​ទាំងអស់​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​នេះ"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "តភ្ជាប់​ទៅ​បណ្ដាញ​នេះ​ដោយ​ស្វ័យប្រវត្តិ ពេល​វា​មាន"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "តភ្ជាប់​ទៅ VPN ដោយ​ស្វ័យប្រវត្តិ ពេល​ប្រើ​ការ​តភ្ជាប់​នេះ"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "ព័ត៌មាន​ការ​តភ្ជាប់"
+msgid "Firewall _zone"
+msgstr "តំបន់​ជញ្ជាំង​ភ្លើង៖"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "ការ​តភ្ជាប់​ដែល​បាន​ដាក់​ក្រុម៖"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "តភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "តំបន់​ជញ្ជាំង​ភ្លើង៖"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1767,7 +2006,7 @@ msgstr ""
 "អាសយដ្ឋាន IP កំណត់​អត្តសញ្ញាណ​កុំព្យូទ័រ​របស់​អ្នក​នៅ​លើ​បណ្ដាញ។ ចុច​ប៊ូតុង \"បន្ថែម\" ដើម្បី​បន្ថែម​"
 "អាសយដ្ឋាន IP ។"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1775,128 +2014,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "ស្វ័យប្រវត្តិ តែ​អាសយដ្ឋាន​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "របៀប​ដឹកជញ្ជូន៖"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "បាន​តភ្ជាប់"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "របៀប​ដឹកជញ្ជូន៖"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ឈ្មោះ​ឧបករណ៍ + លេខ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "របៀប៖"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "ស្វ័យប្រវត្តិ​ជាមួយ​នឹង​ការ​កំណត់ DNS ដោយដៃ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "តភ្ជាប់​មូលដ្ឋាន"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "បាន​ចែករំលែក​ទៅ​កុំព្យូទ័រ​ផ្សេងទៀត"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "វិធីសាស្ត្រ៖"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1906,32 +2149,33 @@ msgstr ""
 "គ្រឿង​សម្គាល់​ម៉ាស៊ីន​កូន DHCP អនុញ្ញាត​ឲ្យ​អ្នក​គ្រប់គ្រង​បណ្ដាញ ប្ដូរ​ការ​កំណត់​រចនាសម្ព័ន្ធ​កុំព្យូទ័រ​របស់​អ្នក​តាម​"
 "បំណង​បាន។ ប្រសិនបើ​អ្នក​ចង់​ប្រើ​គ្រឿង​សម្គាល់​ម៉ាស៊ីន​កូន DHCP សូម​បញ្ចូល​វា​នៅ​ទីនេះ។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "ដែន​ដែល​បាន​ប្រើ នៅ​ពេល​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន។ ប្រើ​សញ្ញា​ក្បៀស​ដើម្បី​បំបែក​ដែន​ច្រើន។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "លេខ​សម្គាល់​ម៉ាស៊ីន​កូន DHCP ៖"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "ស្វែងរក​ដែន៖"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "ម៉ាស៊ីន​មេ DNS ៖"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1939,11 +2183,11 @@ msgstr ""
 "អាសយដ្ឋាន IP ម៉ាស៊ីន​មេ​ឈ្មោះ​ដែន​ដែល​បាន​ប្រើ ដើម្បី​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន។ ប្រើ​សញ្ញា​ក្បៀស​ដើម្បី​បំបែក​"
 "អាសយដ្ឋាន​ម៉ាស៊ីន​មេ​ឈ្មោះ​ដែន​ច្រើន។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ទាមទារ​អាសយដ្ឋាន IPv_4 សម្រាប់​ការ​តភ្ជាប់​នេះ​ ដើម្បី​បញ្ចប់"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1951,25 +2195,35 @@ msgstr ""
 "ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ IPv6 ដែល​អាច​តភ្ជាប់​បាន វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​"
 "រចនាសម្ព័ន្ធ​ IPv4 បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv6 គឺជោគជ័យ។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "នាំផ្លូវ…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "បាន​បិទ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "បើក"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -1978,15 +2232,19 @@ msgstr ""
 "អាសយដ្ឋាន IP ម៉ាស៊ីន​មេ​ឈ្មោះ​ដែន​ដែល​បាន​ប្រើ ដើម្បី​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន។ ប្រើ​សញ្ញា​ក្បៀស​ដើម្បី​បំបែក​"
 "អាសយដ្ឋាន​ម៉ាស៊ីន​មេ​ឈ្មោះ​ដែន​ច្រើន។"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ទាមទារអាសយដ្ឋាន IPv_6 សម្រាប់​ការ​តភ្ជាប់​នេះ ដើម្បី​បញ្ចប់"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1994,755 +2252,862 @@ msgstr ""
 "ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ​ខ្សែ IPv4 ដែល​អាច​តភ្ជាប់ វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​"
 "រចនាសម្ព័ន្ធ IPv6 បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv4 គឺ​ជោគជ័យ។"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "ម៉ែត្រ"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "នាំចូល"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "មូលដ្ឋាន"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "លេខ៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "កម្រិត​ខ្ពស់"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "លេខ​សម្គាល់​បណ្ដាញ៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "ផ្លាស់ប្ដូរ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "PIN៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "អនុញ្ញាត​ឲ្យ​រ៉ូមីង ប្រសិនបើ​មិន​មាន​បណ្ដាញ​ផ្ទះ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "វិធីសាស្ត្រ​ដែល​អនុញ្ញាត៖"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "វិធីសាស្ត្រ​កំណត់​រចនាសម្ព័ន្ធ…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "ការ​បង្ហាប់"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ប្រើ​ការ​ដាក់​លេខ​កូដ​ពី​ចំណុច​ទៅ​ចំណុច (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "ទាមទារ​ការដាក់​លេខ​កូដ ១២៨ ប៊ីត"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ប្រើ MPPE ល្អ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "អនុញ្ញាត​ការ​បង្ហាប់​ទិន្នន័យ BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "អនុញ្ញាត​ការ​បង្ហាប់​ទិន្នន័យ Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "ប្រើ​ការ​បង្ហាប់​បឋមកថា TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "ផ្ញើ​កញ្ចប់ echo របស់ PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "វិធីសាស្ត្រ៖"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "គ្មាន"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ក្រុម​ពី​ឯកសារ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "វិធីសាស្ត្រ៖"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "កម្រិត​ខ្ពស់"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "សុវត្ថិភាព៖"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "សុវត្ថិភាព៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "សុវត្ថិភាព៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "សោ​ឯកជន៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "ការ​ពន្យារពេល Link _up ៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "ការ​ពន្យារពេល Link _down ៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ក្រុម​ពី​ឯកសារ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "ការ​កំណត់​រចនាសម្ព័ន្ធ JSON៖"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "កម្រិត​បញ្ជូន​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "អាទិភាព"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "ការ​តភ្ជាប់​ដែល​បាន​ដាក់​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "អ៊ីសឺរណិត"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "អាសយដ្ឋាន​ផ្នែករឹង៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "អាសយដ្ឋាន​ផ្នែករឹង៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "សុវត្ថិភាព៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ថាមពល​បញ្ជូន៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ថាមពល​បញ្ជូន៖"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "ចំណុចប្រទាក់​មេ៖"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "ឈ្មោះ​ចំណុចប្រទាក់ VLAN៖"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "លេខ​សម្គាល់ VLAN៖"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ឈ្មោះ​ឧបករណ៍ + លេខ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + លេខ"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "សុវត្ថិភាព៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ថាមពល​បញ្ជូន៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "អត្រា៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ឆានែល៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "រលកអាកាស៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SSID៖"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ដែល​បាន​អនុញ្ញាត"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​​ដែល​អាច​ពង្រីក​បាន (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ពាក្យសម្ងាត់ (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ការ​ស្វាគមន៍ (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ការ​ស្វាគមន៍​ម៉ៃក្រូសូហ្វ កំណែ ២ (MSCHAP v_2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2751,434 +3116,473 @@ msgstr ""
 "ក្នុង​ករណី​ភាគច្រើន ម៉ាស៊ីន​មេ PPP របស់​ក្រុមហ៊ុន​ផ្ដល់​នឹង​គាំទ្រ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ទាំងអស់។ ប្រសិនបើ​ការ​"
 "តភ្ជាប់​បរាជ័យ សូម​សាកល្បង​បិទ​ការ​គាំទ្រ​វិធីសាស្ត្រ​មួយ​ចំនួន។"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "វ៉ាយហ្វាយ"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "ប៊្លូធូស"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"កម្មវិធី​ជំនួយ VPN បាន​បរាជ័យ​ក្នុង​ការ​នាំចូល​ការ​តភ្ជាប់ VPN ដោយ​ត្រឹមត្រូវ\n"
-"\n"
-"កំហុស៖ គ្មាន​ប្រភេទ​សេវា VPN ។"
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "មិន​អាច​នាំចូល​ការ​​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"មិន​អាច​អាន​ឯកសារ '%s' ឬ​វា​មិន​មាន​ព័ត៌មាន​ការ​តភ្ជាប់ VPN ដែល​ត្រូវ​បាន​ទទួល​ស្គាល់\n"
+"កម្មវិធី​ជំនួយ VPN បាន​បរាជ័យ​ក្នុង​ការ​នាំចូល​ការ​តភ្ជាប់ VPN ដោយ​ត្រឹមត្រូវ\n"
 "\n"
-"កំហុស៖ %s ។"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "មិន​ស្គាល់​កំហុស"
+"កំហុស៖ គ្មាន​ប្រភេទ​សេវា VPN ។"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ជ្រើស​ឯកសារ​ដើម្បី​នាំចូល"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ផ្នែក​រឹង"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "និមិត្ត"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ VPN ដែល​បាន​រក្សាទុក..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​បាន​ទេ ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់​ថ្មី​បាន​ឡើយ"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​លុប​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "តើ​អ្នក​ពិតជា​ចង់​លុប​កា​រ​តភ្ជាប់ %s មែន​ឬ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "ការ​តភ្ជាប់ VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ផ្លូវចេញចូល"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "ម៉ែត្រ"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "បុព្វបទ"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "កែសម្រួល %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "កែសម្រួល​ការ​តភ្ជាប់​ដែល​គ្មាន​ឈ្មោះ"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "ឈ្មោះ​ការ​តភ្ជាប់៖"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "កំហុស​ក្នុង​ការ​ចាប់ផ្ដើម​កម្មវិធី​កែសម្រួល"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​មិន​អាច​រក​ឃើញ​ធនធាន​ដែល​បាន​ទាមទារ (រក​មិន​ឃើញ​ឯកសារ .ui)។"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "រក្សាទុក"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "រក្សាទុក​ការ​ផ្លាស់ប្ដូរ​ណាមួយ​ដែល​បាន​ធ្វើ​ចំពោះ​ការ​តភ្ជាប់​នេះ។"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​រក្សាទុក​ការ​តភ្ជាប់​សម្រាប់​អ្នកប្រើ​ម៉ាស៊ីន​នេះ​ទាំងអស់។"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "មិន​អាច​កែសម្រួល​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "មាន​កំហុស​មិន​ស្គាល់​នៅ​ពេល​បង្កើត​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់។"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "កំហុស​ក្នុង​ការ​ចាប់ផ្ដើម​កម្មវិធី​កែសម្រួល"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "ឈ្មោះ​ការ​តភ្ជាប់៖"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "នាំចេញ..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "កុំ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ឥឡូវនេះ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d នាទី​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ម៉ោង​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ថ្ងៃ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ខែ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ឆ្នាំ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "ការ​តភ្ជាប់ Team %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "ការ​តភ្ជាប់ Team %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "បាន​ប្រើ​លើក​ចុងក្រោយ"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "កែសម្រួល​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​កែសម្រួល​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "លុប​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​លុប​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "មិន​គាំទ្រ​ប្រភេទ​តភ្ជាប់​រលកអាកាស​ចល័ត។"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "មិន​ដឹង​វិធី​បង្កើត​ការ​តភ្ជាប់ '%s'"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "កំហុស​ក្នុងការ​បង្កើត​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "មិន​បាន​ដំឡើង​កម្មវិធី​ជំនួយ VPN ។"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "មិន​ដឹង​វិធី​បង្កើត​ការ​តភ្ជាប់ '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "រក​មិន​ឃើញ​ការ​តភ្ជាប់​ដែល​មាន UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "ការ​តភ្ជាប់​បណ្ដាញ"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "ការ​តភ្ជាប់ VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "សុវត្ថិភាព 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព 802.1X ។"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "ប្រើ​សុវត្ថិភាព 802.1_X សម្រាប់​ការ​តភ្ជាប់​នេះ"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DCB ។"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "រក​មិន​ឃើញ​ឧបករណ៍​ប៊្លូធូស​ឡើយ ។"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ការ​តភ្ជាប់ bond %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "ប៊្លូធូស"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ bond ​។"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ចម្បង៖"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ការ​តភ្ជាប់ bond %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​ប្រ៊ីដ្យ។"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ការ​តភ្ជាប់​ប្រ៊ីដ្យ%d"
@@ -3186,32 +3590,37 @@ msgstr "ការ​តភ្ជាប់​ប្រ៊ីដ្យ%d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "ច្រក​ប្រ៊ីដ្យ"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​ច្រក​ប្រ៊ីដ្យ។"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DCB ។"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DSL ។"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ចំណុចប្រទាក់​មេ៖"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "ការ​តភ្ជាប់ DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3221,44 +3630,43 @@ msgstr ""
 "ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ឧបករណ៍​បណ្ដាញ ដែល​បាន​បញ្ជាក់​ដោយ​អាសយដ្ឋាន MAC អចិន្ត្រៃយ៍​ដែល​"
 "បញ្ចូល​នៅ​ទីនេះ ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "មិន​បាន​អើពើ"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​អ៊ីសឺរណិត។"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ការ​តភ្ជាប់​អ៊ីសឺណិត %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "លំនាំដើម"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3268,11 +3676,11 @@ msgstr ""
 "អំពី​ការ​ប្រើប្រាស់​តំបន់​លំនាំដើម​ដែល​បាន​កំណត់​នៅ​ក្នុង​ជញ្ជាំង​ភ្លើង។ ប្រើ​បានតែ​នៅ​ពេល​ដែល​ជញ្ជាំង​ភ្លើង​សកម្ម​"
 "ប៉ុណ្ណោះ។"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើទូទៅ។"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3283,158 +3691,162 @@ msgstr ""
 "ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ឧបករណ៍​បណ្ដាញ ដែល​បាន​បញ្ជាក់​ដោយ​អាសយដ្ឋាន MAC អចិន្ត្រៃយ៍​ដែល​"
 "បញ្ចូល​នៅ​ទីនេះ ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ InfiniBand ។"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ការ​តភ្ជាប់ InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ IPv4 ។"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ការ​តភ្ជាប់​អ៊ីសឺណិត %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "(VPN) ​ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "អាសយដ្ឋាន (VPN) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ស្វ័យប្រវត្តិ តែ​អាសយដ្ឋាន​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "(PPPoE) ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "អាសយដ្ឋាន (PPPoE) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "(DHCP) ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "អាសយដ្ឋាន (DHCP) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "តែ​ការ​តភ្ជាប់​មូលដ្ឋាន​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "សេវា DNS បន្ថែម៖"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "ដែន​ស្វែងរក​បន្ថែម៖"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "កែសម្រួល​ផ្លូវ IPv4 សម្រាប់ %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "ការ​កំណត់ IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ IPv4 ។"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ស្វ័យប្រវត្តិ តែ DHCP ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "កែសម្រួល​ផ្លូវ​សម្រាប់ IPv6  %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "ការ​កំណត់ IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ IPv6 ។"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ WiMAX ។"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "ការ​តភ្ជាប់ WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "កូន​ចៅ​ស្ទួន"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "កូន​ចៅ '%s' និង '%s' ទាំង​ពីរ​គឺ​បាន​អនុវត្ត​ទៅកាន់​ឧបករណ៍ '%s'"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3442,25 +3854,25 @@ msgid ""
 msgstr ""
 "កូនចៅ '%s' និង '%s' អនុវត្ត​ទៅកាន់​ច្រក​និម្មិត​ផ្សេងគ្នា ('%s' និង '%s') របស់​ឧបករណ៍​ដូចគ្នា។"
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s កូន​ចៅ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​រលកអាកាស​ចល័ត។"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "មិន​គាំទ្រ​ប្រភេទ​តភ្ជាប់​រលកអាកាស​ចល័ត។"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ជ្រើស​ប្រភេទ​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3468,90 +3880,86 @@ msgid ""
 msgstr ""
 "ជ្រើស​បច្ចេកវិទ្យា​ដែល​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​របស់​អ្នក​ប្រើ។ បើ​អ្នក​មិន​ច្បាស់ សូម​សួរ​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM-based (ឧ. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA-based (ឧ. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "គ្មាន"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "កែសម្រួល​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់ PPP សម្រាប់ %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "ការ​កំណត់ PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ PPP ។"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ bond ​។"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "កំហុស៖ ឯកសារ​មិន​មាន​ការ​កំណត់​រចនា​សម្មព័ន្ធ JSON ត្រឹមត្រូវ"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ Team ។"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "ការ​តភ្ជាប់ Team %d"
@@ -3559,69 +3967,69 @@ msgstr "ការ​តភ្ជាប់ Team %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "ច្រក Team"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​ច្រក Team ។"
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (តាម \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "មិនមាន​ការ​តភ្ជាប់​បណ្ដាញ"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ vlan ។"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "ការ​តភ្ជាប់ VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ VPN ។"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "មិន​អាច​រក​ឃើញ​សេវា​កម្មវិធី​ជំនួយ VPN សម្រាប់ '%s' ។"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "មិន​អាច​រក​ឃើញ​សេវា​កម្មវិធី​ជំនួយ VPN សម្រាប់ '%s' ។"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ការ​តភ្ជាប់​បាន​បរាជ័យ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ VPN ។"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "មិន​អាច​រក​ឃើញ​សេវា​កម្មវិធី​ជំនួយ VPN សម្រាប់ '%s' ។"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "ការ​តភ្ជាប់ VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "ជ្រើស​ប្រភេទ​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3631,7 +4039,7 @@ msgstr ""
 "ជ្រើស​ប្រភេទ​តភ្ជាប់ VPN ដែល​អ្នក​ចង់​ប្រើ​សម្រាប់​ការ​តភ្ជាប់​ថ្មី។ ប្រសិនបើ​ប្រភេទ​តភ្ជាប់ VPN ដែល​អ្នក​ចង់​"
 "បង្កើត​មិន​លេចឡើង​នៅ​ក្នុង​បញ្ជី​ទេ អ្នក​ប្រហែលជា​មិន​បាន​ដំឡើង​កម្មវិធី​ជំនួយ VPN ដែល​ត្រឹមត្រូវ។"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3640,7 +4048,7 @@ msgstr ""
 "ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ចំណុច​ចូល​ដំណើរការ (AP) វ៉ាយហ្វាយ​ដែល​បាន​បញ្ជាក់​ដោយ BSSID បាន​"
 "បញ្ចូល​នៅ​ទីនេះ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3650,94 +4058,92 @@ msgstr ""
 "ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ឧបករណ៍​បណ្ដាញ ដែល​បាន​បញ្ជាក់​ដោយ​អាសយដ្ឋាន MAC អចិន្ត្រៃយ៍​ដែល​"
 "បញ្ចូល​នៅ​ទីនេះ ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ឧបករណ៍​ណាមួយ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ការ​តភ្ជាប់​វ៉ាយហ្វាយ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex ឬ ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP (802.1X) ថាមវន្ត"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ក្រុមហ៊ុន"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព​វ៉ាយហ្វាយ ព្រោះ​មិនមាន​ការ​កំណត់​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "មាន​ឯកសារ​ឈ្មោះ​ \"%s\" រួចហើយ។"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ជំនួស"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "តើ​អ្នក​ចង់​ជំនួស %s ដោយ​ការ​តភ្ជាប់ VPN ដែល​អ្នក​បាន​រក្សាទុក​ដែរ​ឬ​ទេ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "មិន​អាច​នាំចេញ​ការ​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3748,476 +4154,459 @@ msgstr ""
 "\n"
 "កំហុស៖ %s ។"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "នាំចេញ​ការ​តភ្ជាប់ VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "ដោះ​សោ"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "ដោះ​សោ​ឧបករណ៍​នេះ​ដោយ​ស្វ័យ​ប្រវត្តិ"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ព័ត៌មាន​តភ្ជាប់"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "ការ​តភ្ជាប់​បណ្ដាញ​សកម្ម"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "សោ​ឯកជន៖"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រោម៖"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ឧបករណ៍​របស់​អ្នក៖"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក៖"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "គម្រោង​របស់​អ្នក៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"ឥឡូវនេះ ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​"
-"ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​អ្នក​"
-"ឡើងវិញ។ ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស \"ការ​តភ្ជាប់​បណ្ដាញ\" ពី​ម៉ឺនុយ "
-"ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "មិន​បាន​រាយ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ជ្រើស​គម្រោង​របស់​អ្នក៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "បាន​ជ្រើស​គម្រោង APN (Access Point Name) ៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"ព្រមាន​៖ ការ​ជ្រើស​គម្រោង​មិន​ត្រឹមត្រូវ​អាច​​​បង្ហាញ​លទ្ធផល​នៅ​ក្នុង​ការ​ចេញ​វិក្កយបត្រ​ សម្រាប់​គណនី​រលកអាកាស ឬ​"
-"អាច​រារាំង​ការ​តភ្ជាប់​របស់​អ្នក។\n"
-"\n"
-"បើ​​អ្នក​មិន​ប្រាកដ​ជាមួយ​គម្រោង​របស់​អ្នក​ទេ​ ​សូម​​សួរ​ក្រុម​ហ៊ុន​ផ្ដល់​​របស់​អ្នក​ អំពី​​គម្រោង APN របស់​អ្នក។"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ជ្រើស​គម្រោង​ចេញ​វិក្កយបត្រ​របស់​អ្នក"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "គម្រោង​របស់​ខ្ញុំ​​មិន​ត្រូវ​បាន​រាយ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​ពី​បញ្ជី៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ក្រុមហ៊ុន​ផ្ដល់៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM  (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA  (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "បញ្ជី​ប្រទេស ឬ​តំបន់៖"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "ប្រទេស ឬ​តំបន់"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "ជ្រើស​ប្រទេស ឬ​តំបន់​របស់​ក្រុមហ៊ុន​ផ្ដល់"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ឧបករណ៍ GSM ដែល​បាន​ដំឡើង"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ឧបករណ៍ CDMA ដែល​បាន​ដំឡើង"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ឧបករណ៍​ណាមួយ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "អ្នកជំនួយការ​នឹង​ជួយ​អ្នក​ក្នុង​ការ​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ទៅកាន់​បណ្ដាញ​ទូរស័ព្ទ (3G) ។"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "អ្នក​នឹង​ត្រូវការ​ព័ត៌មាន​ដូច​ខាងក្រោម៖"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ឈ្មោះ​ក្រុម​ហ៊ុន​ផ្ដល់​​រលក​អាកាស​របស់​អ្នក"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ឈ្មោះ​គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​របស់​អ្នក"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(ក្នុង​ករណី​ខ្លះ​) គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​​​របស់​ APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "បង្កើត​ការ​តភ្ជាប់​សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត​នេះ៖"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ឧបករណ៍​ណាមួយ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "ប្រទេស ឬ​តំបន់"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ជ្រើស​ប្រទេស ឬ​តំបន់​របស់​ក្រុមហ៊ុន​ផ្ដល់"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​ពី​បញ្ជី៖"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM  (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA  (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ជ្រើស​គម្រោង​របស់​អ្នក៖"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "បាន​ជ្រើស​គម្រោង APN (Access Point Name) ៖"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"ព្រមាន​៖ ការ​ជ្រើស​គម្រោង​មិន​ត្រឹមត្រូវ​អាច​​​បង្ហាញ​លទ្ធផល​នៅ​ក្នុង​ការ​ចេញ​វិក្កយបត្រ​ សម្រាប់​គណនី​រលកអាកាស ឬ​"
+"អាច​រារាំង​ការ​តភ្ជាប់​របស់​អ្នក។\n"
+"\n"
+"បើ​​អ្នក​មិន​ប្រាកដ​ជាមួយ​គម្រោង​របស់​អ្នក​ទេ​ ​សូម​​សួរ​ក្រុម​ហ៊ុន​ផ្ដល់​​របស់​អ្នក​ អំពី​​គម្រោង APN របស់​អ្នក។"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ជ្រើស​គម្រោង​ចេញ​វិក្កយបត្រ​របស់​អ្នក"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រោម៖"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ឧបករណ៍​របស់​អ្នក៖"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក៖"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "គម្រោង​របស់​អ្នក៖"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"ឥឡូវនេះ ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​"
+"ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​អ្នក​"
+"ឡើងវិញ។ ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស \"ការ​តភ្ជាប់​បណ្ដាញ\" ពី​ម៉ឺនុយ "
+"ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(គ្មាន)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "វិញ្ញាបនបត្រ CA ៖"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "មិនស្គាល់"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "វិញ្ញាបនបត្រ​អ្នកប្រើ៖"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "ដោះ​សោ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "រក្សាទុក​ពាក្យសម្ងាត់​​សម្រាប់​តែ​អ្នកប្រើ​នេះ​ប៉ុណ្ណោះ"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "រក្សាទុក​ពាក្យសម្ងាត់​សម្រាប់​គ្រប់​អ្នកប្រើ​ទាំងអស់"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "សួរ​រក​ពាក្យសម្ងាត់​នេះ​រាល់ពេល"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់​ដើម្បី​តភ្ជាប់​ទៅ '%s' ។"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "ពាក្យសម្ងាត់៖"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ពាក្យសម្ងាត់៖"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ផ្ដាច់"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "គ្មាន"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP (802.1X) ថាមវន្ត"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "បង្កើត"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​តាម​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​បង្កើត។"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "ការ​តភ្ជាប់៖"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "បញ្ជី​ប្រទេស ឬ​តំបន់៖"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "ប្រទេស ឬ​តំបន់"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "មាន​ខ្សែ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4227,17 +4616,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ឈ្មោះ​បណ្ដាញ៖"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ការ​តភ្ជាប់៖"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ការ​ប្រើប្រាស់៖"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4245,7 +4656,7 @@ msgstr ""
 "កម្មវិធី​នេះ គឺជា​សមាសភាគ​នៃ NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) ។"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4253,412 +4664,478 @@ msgstr ""
 "វា​មិន​ត្រូវ​បាន​ប្រើ​សម្រាប់​អន្តរកម្ម​បន្ទាត់​ពាក្យ​បញ្ជា​ទេ ប៉ុន្តែ​ប្រើ​សម្រាប់​ដំណើរការ​នៅ​ក្នុង​បរិស្ថាន​ផ្ទៃតុ​"
 "របស់ GNOME ។"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "មិន​បាន​បើក"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "មិន​បាន​ចុះឈ្មោះ"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "បណ្ដាញ​មូលដ្ឋាន (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "បណ្ដាញ​មូលដ្ឋាន"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ស្វែងរក"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "បាន​បដិសេធ​ការ​ចុះឈ្មោះ"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s រ៉ូមីង)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (រ៉ូមីង)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "បណ្ដាញ​រ៉ូមីង (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "បណ្ដាញ​រ៉ូមីង"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "កូដ​ PIN សម្រាប់​ស៊ីមកាត '%s' នៅ​លើ '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "បាន​ទាមទារ​កូដ PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "បាន​ទាមទារ​កូដ PIN សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s' សកម្ម ៖ (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "រ៉ូមីង"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "ការ​តភ្ជាប់ %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "វិញ្ញាបនបត្រ DER ឬ PEM  (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ឬ​ពាក្យ​គន្លឹះ​សម្ងាត់ PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ជ្រើស​ឯកសារ PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "ឯកសារ PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ឯកសារ​ទាំងអស់"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "អនាមិក"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "បាន​​ផ្ទៀងផ្ទាត់"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "ទាំងពីរ"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "អត្តសញ្ញាណ​អនាមិក៖"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "ឯកសារ PAC៖"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់​ខាងក្នុង៖"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "អនុញ្ញាត​ការ​ផ្ដល់ PAC ដោយ​ស្វ័យប្រវត្តិ"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "ជ្រើស​វិញ្ញាបនបត្រ​ប្រភព​វិញ្ញាបនបត្រ..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "កំណែ ០"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "កំណែ ១"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "វិញ្ញាបនបត្រ CA ៖"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "កំណែ PEAP ៖"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "អត្តសញ្ញាណ៖"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "ផ្ទៀងផ្ទាត់៖"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "១ (លំនាំដើម)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "បើក​ប្រព័ន្ធ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "សោ​ដែល​បាន​ចែករំលែក"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "១ (លំនាំដើម)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "សោ៖"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "បង្ហាញ​សោ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "លិបិក្រម WEP៖"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ប្រភេទ៖"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (លំនាំដើម)"
+
+#~ msgid "Ignored"
+#~ msgstr "មិន​បាន​អើពើ"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​បច្ចុប្បន្នភាព​តភ្ជាប់​សុវត្ថិភាព ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "តភ្ជាប់​ទៅ​បណ្ដាញ​នេះ​ដោយ​ស្វ័យប្រវត្តិ ពេល​វា​មាន"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "ព័ត៌មាន​ការ​តភ្ជាប់"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "មិន​អាច​នាំចូល​ការ​​តភ្ជាប់ VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "មិន​អាច​អាន​ឯកសារ '%s' ឬ​វា​មិន​មាន​ព័ត៌មាន​ការ​តភ្ជាប់ VPN ដែល​ត្រូវ​បាន​ទទួល​ស្គាល់\n"
+#~ "\n"
+#~ "កំហុស៖ %s ។"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "មិន​ស្គាល់​កំហុស"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "ជ្រើស​វិញ្ញាបនបត្រ​ប្រភព​វិញ្ញាបនបត្រ..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "វិញ្ញាបនបត្រ CA ៖"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "អាប់ភ្លេត NetworkManager"
@@ -4692,30 +5169,6 @@ msgstr "ប្រភេទ៖"
 #~ 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"
 
@@ -4936,15 +5389,6 @@ msgstr "ប្រភេទ៖"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS ទីមួយ៖"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS ទីពីរ៖"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS ទីបី៖"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "អាសយដ្ឋាន MAC របស់​ឧបករណ៍៖"
 
@@ -5000,12 +5444,6 @@ msgstr "ប្រភេទ៖"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "អាសយដ្ឋាន (PPP) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ WiMAX ។"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "ការ​តភ្ជាប់ WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5025,9 +5463,6 @@ msgstr "ប្រភេទ៖"
 #~ msgid "Error: %s"
 #~ msgstr "កំហុស៖ %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ការ​តភ្ជាប់ DUN៖ %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "ឥឡូវនេះ​ទូរស័ព្ទ​របស់​អ្នក​អាច​ប្រើ​បាន​ហើយ!"
 
@@ -5067,9 +5502,6 @@ msgstr "ប្រភេទ៖"
 #~ msgid "%s Network"
 #~ msgstr "បណ្ដាញ %s"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "តភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "មាន​សម្រាប់​គ្រប់​អ្នកប្រើ"
 
@@ -5134,9 +5566,6 @@ msgstr "ប្រភេទ៖"
 #~ msgid "Wireless connection %d"
 #~ msgstr "ការ​តភ្ជាប់​បណ្ដាញ​ឥតខ្សែ %d"
 
-#~ msgid "_Import"
-#~ msgstr "នាំចូល"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "កំហុស​មិនស្គាល់​បាន​កើតឡើង ។"
 
diff --git a/po/kn.po b/po/kn.po
index da77c21a..a3f5ca4a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-12-02 05:10-0500\n"
 "Last-Translator: Shankar <svenkate@redhat.com>\n"
 "Language-Team: kn_IN <kde-i18n-doc@kde.org>\n"
@@ -20,41 +21,50 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "%s ಜಾಲಬಂಧ"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಹಾಗು ಬದಲಾಯಿಸಿ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
 "ಬದಲಾಯಿಸಿ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾದ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -62,12 +72,12 @@ msgstr ""
 "ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
 "ಬದಲಾಯಿಸಿ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -76,30 +86,31 @@ msgstr ""
 "ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
 "ಬದಲಾಯಿಸಿ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ ಎಂಬ ಸೂಚನೆಗಳನ್ನು ತಡೆಹಿಡಿ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿರುವುದನ್ನು ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಬದಲಾಯಿಸಿ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "ಮುದ್ರೆ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಹೊಸ ಆವೃತ್ತಿಗೆ ವರ್ಗಾಯಿಸಬೇಕೆ ಎಂದು ನಿರ್ಧರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi ನಿರ್ಮಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -107,162 +118,175 @@ msgstr ""
 "ಆಪ್ಲೆಟ್‌ ಅನ್ನು ಬಳಸುವಾಗ ಒಂದು ತಾತ್ಕಾಲಿಕ ಜಾಲಬಂಧವನ್ನು ರಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು "
 "TRUE ಗೆ ಬದಲಾಯಿಸಿ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "ಜಾಲಬಂಧ ವ್ಯವಸ್ಥಾಪಕ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager ಆಪ್ಲೆಟ್"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "ತಂತಿಸಹಿತ 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸು(_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "ತಾತ್ಕಾಲಿಕ"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ಈ ಸಂದೇಶವನ್ನು ಇನ್ನೊಮ್ಮೆ ತೋರಿಸಬೇಡ"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -272,7 +296,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +306,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -291,7 +315,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯನ್ನು ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗಿದೆ."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -301,7 +325,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಅಮಾನ್ಯವಾದ ಸಂರಚನೆಯನ್ನು ಮರಳಿಸಿದೆ."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -310,7 +334,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಸಂಪರ್ಕದ ಪ್ರಯತ್ನದ ಕಾಲಾವಧಿ ಮೀರಿದೆ."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -319,7 +343,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಸರಿಯಾದ ಸಮಯದಲ್ಲಿ ಆರಂಭಗೊಳ್ಳಲಿಲ್ಲ."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -328,7 +352,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -338,7 +362,7 @@ msgstr ""
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಮಾನ್ಯವಾದ ಯಾವುದೆ VPN ರಹಸ್ಯಗಳಿಲ್ಲ "
 "(ಸೀಕ್ರೇಟ್‌ಗಳಿಲ್ಲ)."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -347,7 +371,7 @@ msgstr ""
 "\n"
 "ಅಮಾನ್ಯವಾದ VPN ರಹಸ್ಯಗಳಿರದ(ಸಿಕ್ರೇಟ್‌ಗಳಿರದ) VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -356,7 +380,7 @@ msgstr ""
 "\n"
 "VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -364,19 +388,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN ಪ್ರವೇಶ ಸಂದೇಶ"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -389,7 +413,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -402,598 +426,627 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ (ಫರ್ಮ್-ವೇರ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN ಸಂಪರ್ಕಗಳು"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN ಅನ್ನು ಸಂರಚಿಸು(_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN ಸಂಪರ್ಕಗಳು"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager ಚಾಲನೆಯಲ್ಲಿಲ್ಲ..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ಜಾಲಬಂಧವನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "ವೈರ್ಲೆಸ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸು(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡನ್ನು ಶಕ್ತಗೊಳಿಸು(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "ಸೂಚನೆಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು(_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "ಸಂಪರ್ಕಗಳನ್ನು ಸಂಪಾದಿಸು..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "ಇದರ ಬಗ್ಗೆ(_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "ನೀವು '%s' ಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' ಗಾಗಿನ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' ಗಾಗಿ ಒಂದು VPN ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ಆಪ್ಲೆಟ್"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಕೋಡ್ ಅನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ಲಭ್ಯ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲಾಗಿದೆ"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ನೀವು ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧದ ಗುಪ್ತಪದ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "ನೀವು ಈಗ ಬಾಂಡ್ ಮಾಡಿದ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "ನೀವು ಈಗ ಬ್ರಿಜ್‌ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ನೀವು ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "'%s' ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರ ದೃಢೀಕರಣ..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ವು ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ಸ್ವಯಂ ಎತರ್ನೆಟ್"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "ನೀವು ಈಗ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಜ್ಜುಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಗಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರರ ದೃಢೀಕರಣ..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' ಗಾಗಿ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ದೃಢೀಕರಣ"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
 msgstr[1] "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "ವೈರ್ಲೆಸ್ ಅಶಕ್ತಗೊಂಡಿದೆ"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "ಹೆಚ್ಚಿನ ಜಾಲಬಂಧಗಳು"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಈ ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ಕಿಸಿ"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "ನೀವು ಈಗ ವೈ-ಫೈ ಜಾಲಬಂಧ '%s' ನೊಂದಿಗೆ ಈಗ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಗಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರರ ದೃಢೀಕರಣ..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' ಗಾಗಿನ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ಡೈನಮಿಕ್ WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 #, fuzzy
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 #, fuzzy
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ವಿಳಾಸ"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ಪ್ರಸರಣಾ ವಿಳಾಸ"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 #, fuzzy
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "ಸಬ್‌ನೆಟ್ ಮಾಸ್ಕ್‍"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ಪ್ರಾಥಮಿಕ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ದ್ವಿತೀಯ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ತೃತೀಯ DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ಇತರ್ನೆಟ್ (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ಸಂಪರ್ಕಸಾಧನ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ಚಾಲಕ"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ವೇಗ"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "ಸುರಕ್ಷತೆ:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ರೌಟ್"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "ಕಡೆಗಣಿಸು"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ಗುಪ್ತಪದ:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "ಬಗೆ(_T):"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "ಗೇಟ್‌ವೇ"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "ಸಂಪರ್ಕ(_n):"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "ಹಕ್ಕು © 2004-2012 Red Hat, Inc.\n"
 "ಹಕ್ಕು © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಾಧನಗಳು ಹಾಗು ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸುವ ಸೂಚನಾ ಸ್ಥಳದ ಆಪ್ಲೆಟ್."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager ಜಾಲತಾಣ"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. <svenkate@redhat.com>"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -1002,33 +1055,33 @@ msgstr ""
 "NetworkManager ಆಪ್ಲೆಟ್‌ಗೆ ಕೆಲವು ಅಗತ್ಯ ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (ಗ್ಲೇಡ್ ಕಡತವು "
 "ಕಂಡುಬಂದಿಲ್ಲ)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ಕಾಣೆಯಾದ ಸಂಪನ್ಮೂಲಗಳು"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧದ ಗುಪ್ತಪದ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಅಗತ್ಯವಿರುವ ಗುಪ್ತಪದ."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ಗುಪ್ತಪದ:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1038,27 +1091,27 @@ msgstr ""
 "ಅಗತ್ಯವಿರುತ್ತದೆ."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 #, fuzzy
 msgid "PIN code:"
 msgstr "PIN ಕೋಡ್‌:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 #, fuzzy
 msgid "Show PIN code"
 msgstr "PIN ಕೋಡ್‌ ಅನ್ನು ತೋರಿಸು:"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1068,39 +1121,46 @@ msgstr ""
 "ಅಗತ್ಯವಿರುತ್ತದೆ."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 #, fuzzy
 msgid "PUK code:"
 msgstr "PUK ಕೋಡ್:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 #, fuzzy
 msgid "New PIN code:"
 msgstr "ಹೊಸ PIN ಕೋಡ್‌:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 #, fuzzy
 msgid "Re-enter new PIN code:"
 msgstr "ಹೊಸ PIN ಕೋಡ್ ಅನ್ನು ಮರಳಿ ನಮೂದಿಸಿ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 #, fuzzy
 msgid "Show PIN/PUK codes"
 msgstr "ಹೊಸ 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1109,59 +1169,59 @@ msgstr ""
 "IP ವಿಳಾಸಗಳು ಜಾಲಬಂಧದಲ್ಲಿ ನಿಮ್ಮ ಗಣಕವನ್ನು ಗುರುತಿಸುತ್ತವೆ.  IP ವಿಳಾಸವನ್ನು ಸೇರಿಸಲು "
 "\"ಸೇರಿಸು\" ಗುಂಡಿಯನ್ನು ಒತ್ತಿ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "ಅಳಿಸು (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಡೆಯಲಾದ ರೌಟ್‌ಗಳನ್ನು ಆಲಕ್ಷಿಸು(_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "ಈ ಸಂಪರ್ಕವನ್ನು ಕೇವಲ ಅದರ ಜಾಲಬಂಧದ ಸಂಪನ್ಮೂಲಗಳನ್ನು ಬಳಸಲು ಮಾತ್ರವೆ ಉಪಯೋಗಿಸು(_o)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, ಈ ಸಂಪರ್ಕವನ್ನು ಎಂದಿಗೂ ಸಹ ಪೂರ್ವನಿಯೋಜಿತ ಜಾಲಬಂಧವಾಗಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "ರಚಿಸು(_r)"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1169,85 +1229,100 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "ಸೇವೆ(_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "ರೌಂಡ್-ರಾಬಿನ್"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "ಸಕ್ರಿಯ ಬ್ಯಾಕ್ಅಪ್"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ಪ್ರಸರಣೆ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "ಅಡಾಪ್ಟೀವ್ ಟ್ರಾನ್ಸ್‌ಮಿಟ್ ಲೋಡ್ ಬ್ಯಾಲೆನ್ಸಿಂಗ್"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "ಅಡಾಪ್ಟೀವ್ ಲೋಡ್ ಬ್ಯಾಲೆನ್ಸಿಂಗ್"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ಸಲಹೆ ಮಾಡಲಾಗುವ)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "ಕ್ರಮ(_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "ಸಂಪಾದಿಸು (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "ಮೇಲ್ವಿಚಾರಣಾ ಫ್ರೀಕ್ವೆನ್ಸಿ ( _f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "ಕೊಂಡಿ ಮೇಲ್ವಿಚಾರಣೆ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP ಗುರಿಗಳು (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1255,128 +1330,180 @@ msgstr ""
 "ಕೊಂಡಿ ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸುವಾಗ, ಒಂದು IP  ವಿಳಾಸ, ಅಥವ ಒಂದು ವಿರಾಮ-ಚಿಹ್ನೆಯಿಂದ "
 "ಪ್ರತ್ಯೇಕಗೊಂಡ IP ವಿಳಾಸಗಳ ಪಟ್ಟಿ."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "ಲಿಂಕ್ ಅಪ್ ವಿಳಂಬ (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "ಪ್ರಾಥಮಿಕ DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "ಬೈಟ್‌ಗಳು"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
-msgid "_Hairpin mode:"
+msgid "_Hairpin mode"
 msgstr "ವರ್ಗಾವಣೆ ಕ್ರಮ (_T):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
-msgid "_Forward delay:"
+msgid "_Forward delay"
 msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 #, fuzzy
 msgid "s"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1387,437 +1514,529 @@ msgstr ""
 "ವಿಳಾಸವಾಗಿ ಬಳಸಲಾಗುತ್ತದೆ.  ಈ ಸವಲತ್ತನ್ನು MAC ಕ್ಲೋನಿಂಗ್ ಅಥವ ಸ್ಪೂಫಿಂಗ್ ಎಂದು "
 "ಕರೆಯಲಾಗುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ವಿಳಾಸ"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ವಿಳಾಸ"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_n):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ಯಾವುದೆ ಸಾಧನ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"ಒಂದು ಗೊತ್ತಿರದ ದೋಷದಿಂದಾಗಿ ಸಂಪರ್ಕ ರಹಸ್ಯಗಳನ್ನು (ಸೀಕ್ರೆಟ್‌ಗಳನ್ನು) ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ "
-"ವಿಫಲಗೊಂಡಿದೆ."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ 802.1X ಸುರಕ್ಷತೆಯನ್ನು ಬಳಸು"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "ಸೇವೆ(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "ಗುಪ್ತಪದವನ್ನು ತೋರಿಸು(_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ಸಂಪರ್ಕಸಾಧನ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ಟ್ವಿಸ್ಟೆಡ್ ಪೇರ್ (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "ಅಟ್ಯಾಚ್‌ಮೆಂಟ್ ಯುನಿಟ್ ಇಂಟರ್ಫೇಸ್ (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "ಮೀಡಿಯಾ ಇಂಡಿಪೆಂಡೆಂಟ್ ಇಂಟರ್ಫೇಸ್ (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "ಆಲಕ್ಷಿಸು"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ಕೈಯಾರೆ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "ಸೇವೆ(_S):"
+msgid "_Port"
+msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "ಆಲಕ್ಷಿಸು"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ಪ್ರಸರಣೆ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ವೇಗ(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "ಸಂಪೂರ್ಣ ಡ್ಯೂಪ್ಲೆಕ್ಸ್(_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "ನೀವು ಈಗ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ(_I)"
+msgid "_Metered connection"
+msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ ಜೋಡಿಸು(_a)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1826,7 +2045,7 @@ msgstr ""
 "IP ವಿಳಾಸಗಳು ಜಾಲಬಂಧದಲ್ಲಿ ನಿಮ್ಮ ಗಣಕವನ್ನು ಗುರುತಿಸುತ್ತವೆ.  IP ವಿಳಾಸವನ್ನು ಸೇರಿಸಲು "
 "\"ಸೇರಿಸು\" ಗುಂಡಿಯನ್ನು ಒತ್ತಿ."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1834,129 +2053,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "ಸ್ವಯಂಚಾಲಿತ, ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "ವಿಳಾಸ"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ವರ್ಗಾವಣೆ ಕ್ರಮ (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ಡೇಟಾಗ್ರಾಮ್"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗಿದೆ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "ವರ್ಗಾವಣೆ ಕ್ರಮ (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ಸಾಧನದ ಹೆಸರು + ಸಂಖ್ಯೆ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ಇತರ್ನೆಟ್ (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "ಕ್ರಮ (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "ಮ್ಯಾನುವಲ್ DNS ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ಸ್ಥಳೀಯ-ಕೊಂಡಿ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "ಇತರೆ ಗಣಕಗಳೊಂದಿಗೆ ಹಂಚಲಾಗಿದೆ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "ವಿಧಾನ(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1967,8 +2190,8 @@ msgstr ""
 "ಐಡೆಂಟಿಫಯರ್ ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ.  ನೀವು DHCP ಕ್ಲೈಂಟ್ ಐಡೆಂಟಿಫಯರನ್ನು ಬಳಸಲು ಬಯಸಿದಲ್ಲಿ "
 "ಅದನ್ನು ಇಲ್ಲಿ ನಮೂದಿಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1976,26 +2199,26 @@ msgstr ""
 "ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸುವಾಗ ಬಳಸಲಾದ ಡೊಮೈನುಗಳು.ಅನೇಕ ಡೊಮೈನುಗಳಿದ್ದಲ್ಲಿ ಅವನ್ನು "
 "ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP ಕ್ಲೈಂಟ್ ID:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "ಹುಡುಕು ಡೊಮೈನ್‌ಗಳು(_S):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS ಪರಿಚಾರಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2003,12 +2226,12 @@ msgstr ""
 "ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸಲು ಬಳಸಲಾಗುವ ಡೊಮೈನ್‌ ಹೆಸರಿನ ಪರಿಚಾರಕಗಳ IP ವಿಳಾಸಗಳು. "
 "ಅನೇಕ ಡೊಮೈನ್ ಹೆಸರಿನ ಪರಿಚಾರಕ ವಿಳಾಸಗಳನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ಈ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು IPv4 ವಿಳಾಸ ನೀಡಿಕೆಯ ಅಗತ್ಯವಿರುತ್ತದೆ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2016,25 +2239,34 @@ msgstr ""
 "IPv6-ಸಾಮರ್ಥ್ಯವನ್ನು ಹೊಂದಿರುವ ಜಾಲಬಂಧಗಳೊಂದಿಗೆ ಸಂಪರ್ಕ ಹೊಂದುವಾಗ, ಎಲ್ಲಿಯಾದರೂ IPv4 "
 "ಸಂರಚನೆಯು ವಿಫಲಗೊಂಡು IPv6 ಯಶಸ್ವಿಯಾದಲ್ಲಿ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "ಅಶಕ್ತಗೊಂಡ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2044,16 +2276,20 @@ msgstr ""
 "ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸಲು ಬಳಸಲಾಗುವ ಡೊಮೈನ್‌ ಹೆಸರಿನ ಪರಿಚಾರಕಗಳ IP ವಿಳಾಸಗಳು. "
 "ಅನೇಕ ಡೊಮೈನ್ ಹೆಸರಿನ ಪರಿಚಾರಕ ವಿಳಾಸಗಳನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ಈ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು IPv6 ವಿಳಾಸ ನೀಡಿಕೆಯ ಅಗತ್ಯವಿರುತ್ತದೆ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2061,764 +2297,866 @@ msgstr ""
 "IPv4-ಸಾಮರ್ಥ್ಯವನ್ನು ಹೊಂದಿರುವ ಜಾಲಬಂಧಗಳೊಂದಿಗೆ ಸಂಪರ್ಕ ಹೊಂದುವಾಗ, ಎಲ್ಲಿಯಾದರೂ IPv6 "
 "ಸಂರಚನೆಯು ವಿಫಲಗೊಂಡು IPv4 ಯಶಸ್ವಿಯಾದಲ್ಲಿ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "ಮೆಟ್ರಿಕ್"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "ಸಂಖ್ಯೆ(_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 #, fuzzy
 msgid "Advanced"
 msgstr "<b>ಸುಧಾರಿತ</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ಜಾಲಬಂಧ ID(_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "ಬದಲಾಯಿಸು..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ ಲಭ್ಯವಿಲ್ಲದೆ ಇಲ್ಲದೆ ಇದ್ದಲ್ಲಿ ರೋಮಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "ಅನುಮತಿ ಇರುವ ವಿಧಾನಗಳು:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 #, fuzzy
 msgid "Configure _Methods…"
 msgstr "ಸಂರಚನಾ ವಿಧಾನಗಳು (_M)&#x2026;"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "<b>ಸಂಕುಚನೆ</b>"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ಪಾಯಿಂಟ್‌-ಟು-ಪಾಯಿಂಟ್ ಎನಕ್ರಿಪ್ಶನ್ (MPPE) ಅನ್ನು ಬಳಸು (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-ಬಿಟ್ ಗೂಢಲಿಪೀಕರಣದ ಅಗತ್ಯವಿರುತ್ತದೆ(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ಸ್ಟೇಟ್‌ಫುಲ್ MPPE ಅನ್ನು ಬಳಸು (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD ದತ್ತಾಂಶ ಸಂಕುಚನೆಯನ್ನು ಅನುಮತಿಸು"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "ಕುಂದಿಸುವ (ಡಿಫ್ಲೇಟ್) ದತ್ತಾಂಶ ಸಂಕುಚನವನ್ನು ಅನುಮತಿಸು (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP ಹೆಡರ್ ಸಂಕುಚನೆಯನ್ನು ಬಳಸು(_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP ಪ್ರತಿಧ್ವನಿ ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಕಳುಹಿಸು(_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ವಿಧಾನ(_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ವಿಧಾನ(_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "<b>ಸುಧಾರಿತ</b>"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "ಸುರಕ್ಷತೆ(_S):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "ಲಿಂಕ್ ಅಪ್ ವಿಳಂಬ (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP ಗುರಿಗಳು (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP ಗುರಿಗಳು (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ಇತರ್ನೆಟ್ (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "ಸ್ವಯಂ ಎತರ್ನೆಟ್"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 #, fuzzy
 msgid "Any L3 protocol"
 msgstr "WPA ಪ್ರೊಟೊಕಾಲ್:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 #, fuzzy
 msgid "Any L4 protocol"
 msgstr "WPA ಪ್ರೊಟೊಕಾಲ್:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ವರ್ಗಾವಣೆ ಸಾಮರ್ಥ್ಯ(_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ವರ್ಗಾವಣೆ ಸಾಮರ್ಥ್ಯ(_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_n):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ಸಾಧನದ ಹೆಸರು + ಸಂಖ್ಯೆ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + ಸಂಖ್ಯೆ"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "ಸುರಕ್ಷತೆ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ತಾತ್ಕಾಲಿಕ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ವರ್ಗಾವಣೆ ಸಾಮರ್ಥ್ಯ(_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "ದರ(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ಚಾನಲ್(_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ಬ್ಯಾಂಡ್(_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "<b>ಅನುಮತಿಯಿರುವ ದೃಢೀಕರಣ ವಿಧಾನಗಳು</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "ಎಕ್ಸ್‌ಟೆನ್ಸಿಬಲ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "ಗುಪ್ತಪದ ದೃಢೀಕರಣ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್ ಆವೃತ್ತಿ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2828,446 +3166,485 @@ msgstr ""
 "ಬೆಂಬಲಿಸುತ್ತವೆ.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ, ಕೆಲವು ದೃಢೀಕರಣಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಿ ನಂತರ "
 "ಪ್ರಯತ್ನಿಸಿ.</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "ಬಾಂಡ್"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ಬ್ರಿಜ್"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN ಸಂಪರ್ಕಗಳನ್ನು ಸರಿಯಾಗು ಆಮದು ಮಾಡಿಕೊಳ್ಳುವಲ್ಲಿ VPN ಪ್ಲಗ್‌ಇನ್ ವಿಫಲಗೊಂಡಿದೆ\n"
-"\n"
-"ದೋಷ: ಯಾವುದೆ VPN ಸೇವೆಯ ಪ್ರಕಾರವಿಲ್ಲ."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN ಸಂಪರ್ಕವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ಕಡತ '%s' ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಅಥವ ಮಾನ್ಯವಾದ VPN ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಹೊಂದಿಲ್ಲ\n"
+"VPN ಸಂಪರ್ಕಗಳನ್ನು ಸರಿಯಾಗು ಆಮದು ಮಾಡಿಕೊಳ್ಳುವಲ್ಲಿ VPN ಪ್ಲಗ್‌ಇನ್ ವಿಫಲಗೊಂಡಿದೆ\n"
 "\n"
-"ದೋಷ: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "ಅಜ್ಞಾತ"
+"ದೋಷ: ಯಾವುದೆ VPN ಸೇವೆಯ ಪ್ರಕಾರವಿಲ್ಲ."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ಆಮದು ಮಾಡಲು ಕಡತವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ಯಂತ್ರಾಂಶ"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "ವರ್ಚುವಲ್"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ಅಜ್ಞಾತ ದೋಷದಿಂದಾಗಿ ಸಂಪರ್ಕ ಸಂಪಾದಕ ಸಂವಾದವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಅಳಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ನೀವು ನಿಜವಾಗಲೂ ಸಂಪರ್ಕ %s ಅನ್ನು ಅಳಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN ಸಂಪರ್ಕಗಳು"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ವಿಳಾಸ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "ನೆಟ್‍ಮಾಸ್ಕ್‍"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ಗೇಟ್‌ವೇ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "ಮೆಟ್ರಿಕ್"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ಪ್ತಿಫಿಕ್ಸ್"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s ಅನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "ಹೆಸರಿಲ್ಲದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "ಸಂಪರ್ಕದ ಹೆಸರು(_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "ಸಂಪಾದಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "ಸಂಪರ್ಕ ಸಂಪಾದಕಕ್ಕೆ ಅಗತ್ಯವಾದ ಕೆಲವು ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (.ui ಕಡತವು ಕಂಡು ಬಂದಿಲ್ಲ)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ಈ ಸಂಪರ್ಕ ಮಾಡಲಾದ ಯಾವುದೆ ಬದಲಾವಣೆಗಳಿದ್ದಲ್ಲಿ ಅದನ್ನು ಉಳಿಸು."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ಈ ಗಣಕದಲ್ಲಿನ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಈ ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಲು ದೃಢೀಕರಿಸಿ."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "ಸಂಪರ್ಕ ಸಂವಾದವನ್ನು ರಚಿಸುವಲ್ಲಿ ಗೊತ್ತಿರದ ದೋಷ ಉಂಟಾಗಿದೆ."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "ಸಂಪಾದಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "ಸಂಪರ್ಕದ ಹೆಸರು(_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "ರಫ್ತು ಮಾಡು (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "ಲೇಬಲ್"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "ಲೇಬಲ್"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ಎಂದಿಗೂ ಬೇಡ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ಈಗ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ನಿಮಿಷದ ಹಿಂದೆ"
 msgstr[1] "%d ನಿಮಿಷಗಳ ಹಿಂದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ಗಂಟೆಯ ಹಿಂದೆ"
 msgstr[1] "%d ಗಂಟೆಗಳ ಹಿಂದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ದಿನದ ಹಿಂದೆ"
 msgstr[1] "%d ದಿನಗಳ ಹಿಂದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ತಿಂಗಳ ಹಿಂದೆ"
 msgstr[1] "%d ತಿಂಗಳುಗಳ ಹಿಂದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ವರ್ಷದ ಹಿಂದೆ"
 msgstr[1] "%d ವರ್ಷಗಳ ಹಿಂದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ಹೆಸರು"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಬಳಸಲಾದ"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಿ"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಿ"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ಬೆಂಬಲವಿರದ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಬಗೆ."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN ಸಂಪರ್ಕಗಳು"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X ಸುರಕ್ಷತೆ"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Wi-Fi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ 802.1X ಸುರಕ್ಷತೆಯನ್ನು ಬಳಸು"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ಬ್ಲೂಟೂತ್ ಸಾಧನವನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 #, fuzzy
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "ರಚಿಸಲು ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ಆರಿಸಿ:"
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ಪ್ರಾಥಮಿಕ DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
@@ -3275,35 +3652,40 @@ msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 #, fuzzy
 msgid "Bridge Port"
 msgstr "ಬ್ರಿಜ್"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3313,57 +3695,56 @@ msgstr ""
 "ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
 "ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "ಕಡೆಗಣಿಸು"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "ತಂತಿಯುಕ್ತ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ಇತರ್ನೆಟ್ (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3374,185 +3755,187 @@ msgstr ""
 "ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
 "ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPV4 ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (VPN) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ, ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (PPPoE) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (DHCP) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "ಸ್ಥಳೀಯವಾಗಿ ಮಾತ್ರ ಜೋಡಿಸು"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_DNS ಪರಿಚಾರಕಗಳು:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "ಹುಡುಕು ಡೊಮೈನ್‌ಗಳು(_S):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ಗಾಗಿ IPv4 ರೌಟ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 ಸಿದ್ಧತೆಗಳು"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPV4 ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ, DHCP ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ಗಾಗಿ IPv6 ರೌಟ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPV6 ಸಿದ್ಧತೆಗಳು"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPV6 ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL ಸಂಪರ್ಕ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s ಸ್ಲೇವ್ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ಬೆಂಬಲವಿರದ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಬಗೆ."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರು ಬಗೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3561,7 +3944,7 @@ msgstr ""
 "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರು ಬಳಸುವ ತಂತ್ರಜ್ಞಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.  ನಿಮಗೆ ಖಚಿತ "
 "ಮಾಹಿತಿ ಇರದೆ ಹೋದಲ್ಲಿ, ನಿಮಗೆ ಒದಗಿಸಿದವರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ನನಗೆ ಒದಗಿಸುವವರು _GSM-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, GPRS, EDGE, "
@@ -3569,86 +3952,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "ನನಗೆ ಒದಗಿಸುವವರು _CDMA-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ಗಾಗಿ PPP ದೃಢೀಕರಣವನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ಸಿದ್ಧತೆಗಳು"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ಬಳಕೆದಾರ ಸಂಪರ್ಕ ಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "ತಂತಿಯುಕ್ತ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
@@ -3656,11 +4035,11 @@ msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
@@ -3668,68 +4047,68 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "VLAN ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' ಗಾಗಿ VPN ಪ್ಲಗ್‌ಇನ್ ಸೇವೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' ಗಾಗಿ VPN ಪ್ಲಗ್‌ಇನ್ ಸೇವೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' ಗಾಗಿ VPN ಪ್ಲಗ್‌ಇನ್ ಸೇವೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3738,7 +4117,7 @@ msgstr ""
 "ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ BSSID ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ವೈರ್ಲೆಸ್ ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್‌ಗೆ (AP) "
 "ಈ ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3748,100 +4127,98 @@ msgstr ""
 "ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
 "ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ಯಾವುದೆ ಸಾಧನ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ಬಿಟ್ ಕೀಲಿ (ಹೆಕ್ಸ್ ಅಥವ ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ಎಂಟರ್ಪ್ರೈಸ್"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Wi-Fi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ; Wi-Fi ಸಿದ್ಧತೆಯು "
 "ಕಾಣೆಯಾಗಿದೆ."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "ವೈರ್ಲೆಸ್ ಸುರಕ್ಷತೆ"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" ಎಂಬ ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ಬದಲಾಯಿಸು(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s ಅನ್ನು ನೀವು ಉಳಿಸುತ್ತಿರುವ VPN ಸಂಪರ್ಕದೊಂದಿಗೆ ಬದಲಾಯಿಸಬೇಕೆ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN ಸಂಪರ್ಕವನ್ನು ರಫ್ತು ಮಾಡಲಾಗಲಿಲ್ಲ"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3852,227 +4229,106 @@ msgstr ""
 "\n"
 "ದೋಷ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN ಸಂಪರ್ಕವನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸಂರಚಿಸಲಾಗಿದೆ:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ನಿಮ್ಮ ಸಾಧನ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರು:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "ನಿಮ್ಮ ಯೋಜನೆ(ಪ್ಲಾನ್):"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರೊಂದಿಗೆ "
-"ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು "
-"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ ಮೇಲೆ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ "
-"ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ >> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ "
-"\"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ಪಟ್ಟಿ ಮಾಡದೆ ಇರುವ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಆಯ್ಕೆ ಮಾಡಿ(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಯೋಜನೆಯ (ಪ್ಲಾನ್) _APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಹೆಸರು):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ತಪ್ಪಾಗಿ ಆಯ್ಕೆ ಮಾಡಿದಲ್ಲಿ ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಖಾತೆಯ "
-"ಬಿಲ್ಲಿಂಗ್‌ ಸಮಸ್ಯೆಗಳಿಗೆ ಅಥವ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಲು ಕಾರಣವಾಗಬಹುದು .\n"
-"\n"
-"ನಿಮ್ಮ ಯೋಜನೆಯ ಬಗೆಗೆ ನಿಮಗೆ ಮಾಹಿತಿ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ನಿಮ್ಮ ಯೋಜನೆಯ APN ಗಾಗಿ "
-"ಒದಗಿಸುವವರನ್ನು ಕೇಳಿ."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ನನ್ನ ಯೋಜನೆ(ಪ್ಲಾನ್) ಅನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಪಟ್ಟಿಯಿಂದ ಆಯ್ಕೆ ಮಾಡಿ(_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ಒದಗಿಸುವವರು"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr ""
-"ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
-"ಬಯಸುತ್ತೇನೆ(_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ಒದಗಿಸುವವರು:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "ನನಗೆ ಒದಗಿಸುವವರು GSM ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "ನನಗೆ ಒದಗಿಸುವವರು CDMA ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-#, fuzzy
-msgid "Country or Region List:"
-msgstr "ದೇಶದ ಪಟ್ಟಿ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-#, fuzzy
-msgid "Country or region"
-msgstr "ದೇಶದ ಪಟ್ಟಿ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರ ದೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ GSM ಸಾಧನ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ CDMA ಸಾಧನ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ಯಾವುದೆ ಸಾಧನ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4080,191 +4336,272 @@ msgstr ""
 "ಈ ಸಹಾಯಕವು ಒಂದು ಸೆಲ್ಯುಲಾರ್ (3G) ಜಾಲಬಂಧಕ್ಕಾಗಿ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು "
 "ಸಜ್ಜುಗೊಳಿಸಲು ನೆರವಾಗುತ್ತದೆ."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ನೀವು ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನೀಡಬೇಕಾಗುತ್ತದೆ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸಿದವರ ಹೆಸರು"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ(ಪ್ಲಾನ್) ಹೆಸರು"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(ಕೆಲವು ಸಂದರ್ಭಗಳಲ್ಲಿ) ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ನೇಮ್)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ಈ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ಯಾವುದೆ ಸಾಧನ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನ ಸಜ್ಜುಗೊಳಿಸಿ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರ ದೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಪಟ್ಟಿಯಿಂದ ಆಯ್ಕೆ ಮಾಡಿ(_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
+"ಬಯಸುತ್ತೇನೆ(_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ನನಗೆ ಒದಗಿಸುವವರು GSM ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ನನಗೆ ಒದಗಿಸುವವರು CDMA ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಆಯ್ಕೆ ಮಾಡಿ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಯೋಜನೆಯ (ಪ್ಲಾನ್) _APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ಹೆಸರು):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ತಪ್ಪಾಗಿ ಆಯ್ಕೆ ಮಾಡಿದಲ್ಲಿ ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಖಾತೆಯ "
+"ಬಿಲ್ಲಿಂಗ್‌ ಸಮಸ್ಯೆಗಳಿಗೆ ಅಥವ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಲು ಕಾರಣವಾಗಬಹುದು .\n"
+"\n"
+"ನಿಮ್ಮ ಯೋಜನೆಯ ಬಗೆಗೆ ನಿಮಗೆ ಮಾಹಿತಿ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ನಿಮ್ಮ ಯೋಜನೆಯ APN ಗಾಗಿ "
+"ಒದಗಿಸುವವರನ್ನು ಕೇಳಿ."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸಂರಚಿಸಲಾಗಿದೆ:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ನಿಮ್ಮ ಸಾಧನ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರು:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "ನಿಮ್ಮ ಯೋಜನೆ(ಪ್ಲಾನ್):"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರೊಂದಿಗೆ "
+"ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು "
+"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ ಮೇಲೆ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ "
+"ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ >> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ "
+"\"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "ಪ್ರತಿ ಬಾರಿಯೂ ಈ ಗುಪ್ತಪದಕ್ಕಾಗಿ ಕೇಳು(_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s' ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಅಗತ್ಯವಿರುವ ಗುಪ್ತಪದ."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "ಗುಪ್ತಪದ(_P):"
+msgid "Sh_ow passwords"
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
+msgid "_Secondary Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ಡೈನಮಿಕ್ WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "ರಚಿಸು(_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4272,42 +4609,42 @@ msgstr ""
 "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ '%s' ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಗುಪ್ತಪದ ಅಥವ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯ "
 "ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕಾಗಿ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ನೀವು ನಿರ್ಮಿಸಲು ಬಯಸುವ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4315,38 +4652,59 @@ msgid ""
 msgstr ""
 "ನೀವು ಸಂಪರ್ಕ ಹೊಂದಲು ಬಯಸುವ ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕದ ಸುರಕ್ಷತಾ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "ಸಂಪರ್ಕ(_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"ನನಗೆ ಒದಗಿಸುವವರನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಹಾಗು ನಾನೆ ಸ್ವತಃ ನಮೂದಿಸಲು "
+"ಬಯಸುತ್ತೇನೆ(_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ಒದಗಿಸುವವರು:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "ತಂತಿಯುಕ್ತ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4356,17 +4714,42 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ಸಂಪರ್ಕ(_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ಬಳಕೆ:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 #, fuzzy
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
@@ -4375,7 +4758,7 @@ msgstr ""
 "ಈ ಪ್ರೊಗ್ರಾಮ್ NetworkManager ನ ಒಂದು ಘಟಕವಾಗಿರುತ್ತದೆ (http://projects.gnome.org/"
 "NetworkManager)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4383,433 +4766,468 @@ msgstr ""
 "ಇದು ಆಜ್ಞಾ ಸಾಲಿನ ಸಂವಾದಾತ್ಮಕ ಕ್ರಿಯೆಗೆ ಉದ್ಧೇಶಿಸಿಲ್ಲ ಬದಲಾಗಿ GNOME ಗಣಕತೆರೆ ಪರಿಣಾಮವಾಗಿ "
 "ಚಾಲನೆಗೊಳ್ಳುತ್ತದೆ."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ಶಕ್ತಗೊಂಡಿಲ್ಲ"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ಹುಡುಕಲಾಗುತ್ತಿದೆ"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ನೋಂದಣಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ರೋಮಿಂಗ್)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ರೋಮಿಂಗ್)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವು ಸಕ್ರಿಯವಾಗಿದೆ: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ರೋಮಿಂಗ್"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "DSL ಸಂಪರ್ಕ %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER ಅಥವ PEM ಪ್ರಮಾಣಪತ್ರಗಳು (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ಅಥವ PKCS#12 ಖಾಸಗಿ ಕೀಲಿಗಳು (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ಒಂದು PAC ಕಡತವನ್ನು ಆರಿಸು..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ಕಡತಗಳು (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
-msgid "PAC _file:"
+msgid "PAC _file"
 msgstr "_PAC ಕಡತ:"
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "ಆಂತರಿಕ ದೃಢೀಕರಣ(_n):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ಸ್ವಯಂಚಾಲಿತ P_AC ಪ್ರಾವಿಶನಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "ಪ್ರಮಾಣಪತ್ರ ಅಥಾರಿಟಿಯ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "_PEAP ಆವೃತ್ತಿ:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ಗುರುತು(_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ಟನಲ್‌ ಮಾಡಲಾದ TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "ಸಂರಕ್ಷಿತ EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "ದೃಢೀಕರಣ(_A):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr ""
-"1 (ಪೂರ್ವನಿಯೋಜಿತ)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
 "ಹಂಚಲಾದ ಕೀಲಿ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
 "ಹಂಚಲಾದ ಕೀಲಿ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr ""
+"1 (ಪೂರ್ವನಿಯೋಜಿತ)\n"
+"2\n"
+"3\n"
+"4"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "ಕೀಲಿ(_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "ಕೀಲಿಯನ್ನು ತೋರಿಸು(_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP ಸೂಚಿ(_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ಬಗೆ(_T):"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
+
+#~ msgid "Ignored"
+#~ msgstr "ಕಡೆಗಣಿಸು"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "ಒಂದು ಗೊತ್ತಿರದ ದೋಷದಿಂದಾಗಿ ಸಂಪರ್ಕ ರಹಸ್ಯಗಳನ್ನು (ಸೀಕ್ರೆಟ್‌ಗಳನ್ನು) ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ "
+#~ "ವಿಫಲಗೊಂಡಿದೆ."
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ(_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN ಸಂಪರ್ಕವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ಕಡತ '%s' ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಅಥವ ಮಾನ್ಯವಾದ VPN ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಹೊಂದಿಲ್ಲ\n"
+#~ "\n"
+#~ "ದೋಷ: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "ಅಜ್ಞಾತ"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "ಪ್ರಮಾಣಪತ್ರ ಅಥಾರಿಟಿಯ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "ಜಾಲಬಂಧ ವ್ಯವಸ್ಥಾಪಕ"
 
@@ -5003,15 +5421,6 @@ msgstr "ಬಗೆ(_T):"
 #~ msgid "Unknown"
 #~ msgstr "ಅಜ್ಞಾತ"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ದ್ವಿತೀಯ DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ತೃತೀಯ DNS:"
-
-#~ msgid "translator-credits"
-#~ msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. <svenkate@redhat.com>"
-
 #~ msgid "_Help"
 #~ msgstr "ನೆರವು(_H)"
 
@@ -5150,9 +5559,6 @@ msgstr "ಬಗೆ(_T):"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "ಗುಣ '%s' / '%s' ಅಮಾನ್ಯವಾಗಿದೆ: %d"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ ಜೋಡಿಸು(_a)"
-
 #~ msgid "Available to all users"
 #~ msgstr "ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಬಳಕೆದಾರರು"
 
diff --git a/po/ko.po b/po/ko.po
index 35a41270..ec5e5fc2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -21,8 +21,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2017-11-07 06:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
@@ -33,111 +34,121 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "네트워크"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "네트워크 연결을 관리합니다"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "사용 중인 네트워크 연결"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "네트워크 연결 설정을 관리하고 설정을 바꿉니다"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "연결이 되면 알려주지 않음"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "참이면 네트워크에 연결되었을 때 알려주지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "연결이 끊기면 알려주지 않음"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "참이면 네트워크가 끊어졌을 때 알려주지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "가상 사설망 알려주지 않음"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "참이면 가상 사설망에 연결하거나 연결이 끊어졌을 때 알려주지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "네트워크에서 사용 가능한 통지를 무시합니다"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "참이면 와이파이 네트워크가 사용 가능할 때 알려주지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "스탬프"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "설정을 새로운 버전으로 옮겨야 할지를 결정하려고 사용합니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "와이파이 만들기 사용하지 않음"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "참이면 애플릿 사용할 때 애드혹 네트워크를 만들지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "알림 영역에 애플릿 표시"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "거짓으로 설정하면 알림 영역에 애플릿 표시를 하지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA 인증서 무시"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "참이면 CA 인증서가 EAP 2차 인증이 되었는지 경고를 하지 않습니다."
 
 # Tag: title
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "네트워크 연결 없음"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -145,7 +156,7 @@ msgstr ""
 "NetworkManager는 네트워크 연결 및 장치를 관리하고 구성하기위한 시스템 서비스"
 "입니다."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -153,40 +164,40 @@ msgstr ""
 "nm-connection-editor 프로그램은 NetworkManager와 함께 작동하여 NetworkManager"
 "의 기존 연결 프로필을 만들고 편집합니다."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "네트워크 관리 애플릿"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "개체 클래스 '%s'에 이름이 '%s'인 속성이 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "개체 클래스의 '%s'의 속성 '%s'에는 쓸 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "구성 후에는 개체 '%s'의 구성 속성 ''%s''을(를) 설정할 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "'%s::%s'은(는) 올바른 속성 이름이 아닙니다. '%s'은(는) GObject 하위 유형이 아"
 "닙니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "유형 '%s'의 값에서 유형 '%s'의 속성 '%s'(을)를 설정할 수 없습니다"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -195,84 +206,83 @@ msgstr ""
 "유형 '%s'의 값 \"%s\"이(가) 잘못되었거나 유형 '%s'의 속성 '%s' 범위에서 벗어"
 "났습니다"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 인증"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "연결(_O)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "네트워크 이름(_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "애드혹"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "안전한."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "연결 추가/활성화하는 데 실패"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "연결에 실패"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "장치 연결 끊는 데 실패"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "연결 끊는 데 실패"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "연결 활성화 실패"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "다시 보지 않기"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +292,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -292,7 +302,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,7 +312,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 예기치 못하게 중단"
 "되었습니다."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -313,7 +323,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 잘못된 설정을 반환"
 "했습니다."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -322,7 +332,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 연결 시도가 제한 시간을 초과했습니다."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +342,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 제 시간에 시작하"
 "지 못했습니다."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -342,7 +352,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스를 시작하는데 실패했"
 "습니다."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -351,7 +361,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 올바른 가상 사설망 비밀정보가 없습니다."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -360,7 +370,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 비밀 정보가 잘못되었습니다."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -369,7 +379,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -380,19 +390,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "가상 사설망에 성공적으로 연결했습니다.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "가상 사설망 로그인 메시지"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "가상 사설망 연결 실패"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -406,7 +416,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -419,569 +429,581 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "장치가 준비되지 않음(펌웨어 없음)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "장치가 준비되지 않음"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "장치가 관리되지 않음"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "네트워크 장치를 찾을 수 없습니다"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "가상 사설망 설정(_C)..."
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "네트워크 관리가 실행 중이 아닙니다..."
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "네트워크를 사용할 수 없습니다"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "네트워크 사용(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "와이파이 사용(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "모바일 광대역 사용(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "통지기능 사용(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "연결 정보(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "연결 편집..."
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "'%s'에 연결되었습니다."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "네트워크 연결이 끊겼습니다."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "네트워크 연결 '%s' 준비 중..."
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "네트워크 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s'에 네트워크 주소 요청중..."
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "'%s' 네트워크 연결 사용 중"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "가상 사설망 연결 '%s' 시작 중..."
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "가상 사설망 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s'에 가상 사설망 주소 요청 중..."
 
-#: ../src/applet.c:2642
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "가상 사설망 연결 '%s' 사용 중"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "네트워크 연결 없음"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "네트워크 관리 애플릿"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "잘못된 PUK 코드. 서비스 업체에 문의하십시오."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "잘못된 PIN 코드. 서비스 업체에 문의하십시오."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "언락 코드를 보내는 중..."
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "모바일 광대역(%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "모바일 광대역"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "사용 가능"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "새 모바일 광대역 연결"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "연결됨"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "모바일 광대역 네트워크."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "홈 네트워크에 등록되었습니다."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "로밍 네트워크에 등록되었습니다."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s' 준비 중..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s' 설정 중..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "모바일 광대역 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "모바일 광대역 연결 '%s' 사용 중"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "자동 이더넷"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "이더넷 네트워크(%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "이더넷 네트워크(%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "이더넷 네트워크"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "이더넷 네트워크"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "이더넷 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "이더넷 네트워크 '%s' 연결 준비 중..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "이더넷 네트워크 '%s' 연결 설정 중..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "이더넷 네트워크 연결 '%s'에 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "이더넷 네트워크 '%s'에 네트워크 주소 요청 중..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "이더넷 네트워크 연결 '%s' 사용 중"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 인증"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "감춰진 와이파이 네트워크에 연결"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "새 와이파이 네트워크 만들기"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "새로운 연결을 추가하는데 실패"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "권한이 충분하지 않습니다."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "와이파이 네트워크"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "와이파이를 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "와이파이가 하드웨어 스위치를 통해 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "다른 네트워크"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "와이파이 네트워크가 사용 가능합니다"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "네트워크 메뉴에서 와이파이 네트워크에 연결할 수 있습니다"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "와이파이 네트워크 '%s'에 연결되었습니다."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "와이파이 네트워크 '%s' 연결 준비 중..."
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "와이파이 네트워크 '%s' 연결 설정 중..."
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "와이파이 네트워크 연결 '%s'에 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s'에 대한 와이파이 네트워크 주소 요청 중..."
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "연결 활성화하는 데 실패"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "연결 정보 보이기 오류:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "동적 WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "주소"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "없음"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (기본값)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP 주소"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "브로드캐스트 주소"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "서브넷 마스크"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "기본(_P):"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "보조 암호(_S):"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "이더넷(%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 와이파이(%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "일반"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "인터페이스"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "하드웨어 주소"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "드라이버"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "속도"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "보안:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "기본 경로"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "무시함"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "핫스팟"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "암호:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "가상 사설망 형식"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "가상 사설망 게이트웨이"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "가상 사설망 사용자 이름"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "가상 사설망 추방자"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "기반 연결"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "활성된 연결을 찾을 수 없습니다!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -991,22 +1013,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "네트워크 장치와 연결을 관리하는 알림 영역 애플릿."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "네트워크 관리 웹사이트"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "김은주 <eukim@redhat.com>, 2006, 2007, 2009\n"
 "오현석 <hoh@redhat.com>, 2010"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1014,33 +1036,33 @@ msgstr ""
 "네트워크 관리 애플릿이 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니"
 "다.)"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "빠진 자료"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "모바일 광대역 네트워크 암호"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'에 연결하려면 암호가 필요합니다."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "암호:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1048,25 +1070,25 @@ msgid ""
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PIN 코드가 필요합니다."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN 코드:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN 코드 표시"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1074,42 +1096,42 @@ msgid ""
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PUK 코드가 필요합니다."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK 코드:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "새 PIN 코드:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "새 PIN 코드 다시 입력:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK 코드 표시"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 #, fuzzy
 msgid "Connection had no VPN setting"
 msgstr "연결 정보"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, fuzzy, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "연결 활성화하는 데 실패"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "VPN UI에 대한 연결을 작성하지 못했습니다 : 불완전한 쓰기"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1118,56 +1140,56 @@ msgstr ""
 "네트워크에서 컴퓨터를 식별하는 IP 주소. \"추가\" 단추를 눌러 IP 주소를 추가하"
 "십시오."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "추가(_A)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "자동으로 얻은 라우팅 정보 무시(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "이 네트워크에 있는 자원을 위해서만 연결 사용(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "참이면 이 연결은 기본 네트워크 연결로 결코 사용되지 않습니다."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "만들기…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "연결 종류 선택"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1178,112 +1200,122 @@ msgstr ""
 "연결 종류가 목록에 없으면, 가상 사설망 플러그인이 제대로 설치되지 않았을 수"
 "도 있습니다."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "서비스(_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "라운드 로빈"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "액티브 백업"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "브로드캐스트"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "자동 조정 전송 로드 밸런싱"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "자동 조정 로드 밸런싱"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (추천)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
 msgid "Bonded _connections"
 msgstr "본딩 연결(_C):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 #, fuzzy
 msgid "M_ode"
 msgstr "모드(_O):"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
 msgid "Monitoring _frequency"
 msgstr "감시 주기(_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "밀리초"
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
 msgid "_Interface name"
 msgstr "인터페이스 이름(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
 msgid "_Link Monitoring"
 msgstr "연결 감시(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 #, fuzzy
 msgid "ARP _targets"
 msgstr "ARP 대상(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "IP 주소 또는 쉼표로 구분한 IP 주소, 연결 상태를 확인할 때 찾아보는 용도."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
 msgid "Link _up delay"
 msgstr "연결 지연 시간(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
 msgid "Link _down delay"
 msgstr "해제 지연 시간(_D):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
 msgid "_Primary"
 msgstr "기본(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1291,74 +1323,77 @@ 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
 msgid "_MTU"
 msgstr "MTU(_M):"
 
-#: ../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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "바이트"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 #, fuzzy
 msgid "Path _cost"
 msgstr "경로 비용(_C):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
 msgid "_Priority"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
 msgid "_Hairpin mode"
 msgstr "헤어핀 모드(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
 msgid "Bridged _connections"
 msgstr "브릿지 연결(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
 msgid "_Forward delay"
 msgstr "앞으로 지연 시간(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
 msgid "_Hello time"
 msgstr "최초 통신 시간(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP 포워딩 지연 (초)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "초"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP hello 시간 (초)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "네트워크 사용(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1368,17 +1403,17 @@ msgstr ""
 "해 스누핑이 자동으로 비활성화 된 경우 시스템은 충돌이 해결 될 때까지 기능을 "
 "사용하지 못하게 할 수 있습니다."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP(Spanning Tree Protocol) 사용(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "이 브리지에서 STP (Spanning Tree Protocol)를 사용할지 여부를 제어합니다."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1386,29 +1421,29 @@ msgstr ""
 "이 브리지에 대한 STP 우선 순위. 낮은 값은 \"더 좋음\"입니다. 가장 낮은 우선 "
 "순위 브리지가 루트 브리지로 선출됩니다."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
 msgid "_Max age"
 msgstr "최대 기간(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "STP 최대 메시지 수명 (초)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 #, fuzzy
 msgid "_Aging time"
 msgstr "유지 시간(_A):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "이더넷 MAC 주소 에이징 시간 (초)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1419,41 +1454,41 @@ msgstr ""
 "해당하는 16 비트 마스크. 마스크는 STP, MAC 중지 프레임 및 LACP에 사용되므로 "
 "비트 0, 1 또는 2를 설정할 수 없습니다."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "자동"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "기본"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "정의되지 않은 오류"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "저장 "
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "영구적 "
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "임의"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "사용"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1463,197 +1498,241 @@ msgstr ""
 "여기에 입력한 MAC 주소를 이 연결의 네트워크 장치의 하드웨어 주소로 사용합니"
 "다. 이 기능을 MAC 클로닝 혹은 스푸핑이라고 합니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC 주소"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "주소"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "무효의 %s ...에 대한 %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "무효의 %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "에 대한 잘못된 인터페이스 이름 %s (%s) : "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "가상 LAN 인터페이스 이름(_N):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "장치 이름을 구문 분석 할 수 없습니다."
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "하드웨어 주소:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "무효의 %s (%s) : "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "모든 장치"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "무효의 %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "이 연결에 데이터 센터 브릿지(DCB) 사용"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "흐름 제어"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "기능"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "사용"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "알림"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "자발적"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "우선 순위"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "옵션..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "우선 순위 모음"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "구조"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "우선순위 흐름 제어"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "우선순위마다 우선순위 일시중지를 전송할지 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 #, fuzzy
 msgid "0"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 #, fuzzy
 msgid "1"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 #, fuzzy
 msgid "2"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 #, fuzzy
 msgid "3"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 #, fuzzy
 msgid "4"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 #, fuzzy
 msgid "5"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 #, fuzzy
 msgid "6"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 #, fuzzy
 msgid "7"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 #, fuzzy
 msgid "Traffic Class"
 msgstr "트래픽 클래스:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 #, fuzzy
 msgid "Strict Bandwidth"
 msgstr "엄격한 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
 msgid "Priority Bandwidth"
 msgstr "우선 순위 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 #, fuzzy
 msgid "Group Bandwidth"
 msgstr "모음 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 #, fuzzy
 msgid "Group ID"
 msgstr "그룹 아이디:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "사용자 우선 순위마다 우선순위 그룹 아이디를 입력합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1661,34 +1740,34 @@ msgstr ""
 "각 우선순위 그룹마다 사용을 허용할 링크 대역폭 퍼센트를 지정합니다. 그룹의 총"
 "합은 100%여야 합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "각 사용자 우선순위가 사용하는 우선순위 그룹 대역폭의 퍼센트를 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "사용자 우선순위마다 엄격한 대역폭을 사용할지 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "사용자 우선순위마다 트래픽 클래스 지정합니다."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
 msgid "_Username"
 msgstr "사용자 이름(_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "PPPoE 서비스로 인증하는 데 사용되는 사용자 이름"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1696,58 +1775,56 @@ msgstr ""
 "지정된 서비스를 제공하는 액세스 집중 기와 만 세션을 시작하십시오. 대부분의 제"
 "공자는 공백으로 남겨 두어야합니다."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 #, fuzzy
 msgid "_Service"
 msgstr "서비스(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "암호 표시(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "PPPoE 서비스 인증에 사용되는 암호입니다."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
 msgid "_Password"
 msgstr "암호(_P):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 #, fuzzy
 msgid "PPP _interface"
 msgstr "상위 인터페이스(_P):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 #, fuzzy
 msgid "P_arent interface"
 msgstr "상위 인터페이스(_P):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "새로 생성 된 PPP 인터페이스에 지정할 임의의 이름."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "PPP 연결이 설정 될 인터페이스입니다."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 #, fuzzy
 msgid "C_laim interface"
 msgstr "상위 인터페이스(_P):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1755,143 +1832,135 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "자동"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "절반"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "전체 "
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "무시"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "수동"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
 msgid "_Port"
 msgstr "포트(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-#, fuzzy
-msgid "_Device"
-msgstr "서비스(_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
 msgid "C_loned MAC address"
 msgstr "복제한 MAC 주소(_L):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 #, fuzzy
 msgid "Wake on LAN"
 msgstr "비밀키 암호(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "기본"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "무시(_I)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "물티슈"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "브로드캐스트"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
 msgid "_Wake on LAN password"
 msgstr "비밀키 암호(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "Wake-on-LAN 암호 (이더넷 MAC). 마법 패킷에만 유효합니다."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1901,12 +1970,12 @@ msgstr ""
 "\"및 \"Duplex\"값이 강제로 설정됩니다. 확실하지 않으면 \"무시\"또는 \"자동"
 "\"을 선택하십시오."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
 msgid "_Speed"
 msgstr "속도(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1915,12 +1984,12 @@ msgstr ""
 "정적 링크 협상의 속도 값입니다. \"무시\"및 \"자동\"옵션이 선택되지 않은 경우"
 "에만 필요합니다. 속도 값을 지정하기 전에 장치가이를 지원하는지 확인하십시오."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
 msgid "Duple_x"
 msgstr "전이중 연결(full duplex)(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1929,35 +1998,35 @@ msgstr ""
 "정적 링크 협상을위한 이중 값. \"무시\"및 \"자동\"옵션이 선택되지 않은 경우에"
 "만 필요합니다. 양면 모드를 지정하기 전에 장치가 지원하는지 확인하십시오."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 #, fuzzy
 msgid "No"
 msgstr "없음"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "모든 사용자가 이 네트워크에 연결 가능(_U)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
 msgid "Automatically connect to _VPN"
 msgstr "이 연결을 사용할 때 자동으로 가상 사설망에 연결(_V)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
 msgid "Firewall _zone"
 msgstr "방화벽 구역(_Z):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
 msgid "_Metered connection"
 msgstr "팀 연결(_T):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1965,12 +2034,12 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
 msgid "Connect _automatically with priority"
 msgstr "자동으로 얻은 라우팅 정보 무시(_N)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1979,7 +2048,7 @@ msgstr ""
 "자동 활성화를위한 연결 우선 순위. 더 높은 번호의 연결은 자동 활성화를위한 프"
 "로파일을 선택할 때 선호됩니다. 기본값은 0입니다."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1988,7 +2057,7 @@ msgstr ""
 "네트워크에서 컴퓨터를 식별하는 IP 주소. \"추가\" 단추를 눌러 IP 주소를 추가하"
 "십시오."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1999,132 +2068,131 @@ msgstr ""
 "결정합니다. IP 주소를 추가하려면 \"추가\"버튼을 클릭하십시오. 주소가 제공되"
 "지 않으면 범위가 자동으로 결정됩니다."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "주소만 자동"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "주소"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "주소 (선택 사항)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "데이터그램"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "연결"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 #, fuzzy
 msgid "_Transport mode"
 msgstr "전송 모드(_T):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "앉다"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "장치 이름 + 번호"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "이더넷"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "자동, DNS 설정은 수동"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "로컬 연결"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "다른 컴퓨터와 공유"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
 msgid "_Method"
 msgstr "방식(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -2134,8 +2202,8 @@ msgstr ""
 "DHCP 클라이언트 ID를 이용해 네트워크 관리에서 컴퓨터 설정을 개별적으로 지정"
 "할 수 있습니다. DHCP 클라이언트 ID를 사용하고 싶다면, 여기 입력하십시오."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2143,28 +2211,26 @@ msgstr ""
 "호스트 이름에서 주소를 찾을 때 사용할 도메인. 여러 도메인을 사용할 경우 쉼표"
 "로 구분하십시오."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
 msgid "D_HCP client ID"
 msgstr "D_HCP 클라이언트 ID:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
 msgid "S_earch domains"
 msgstr "검색 도메인(_E):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
 msgid "DNS ser_vers"
 msgstr "DNS 서버(_V):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2172,11 +2238,11 @@ msgstr ""
 "호스트 이름에서 주소를 검색하는 데 사용할 도메인 네임 서버의 IP 주소. 여러 도"
 "메인 서버를 사용하려면 쉼표로 구분하십시오."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "이 연결이 되려면 IPv4 주소 부여 필요(_4)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2184,34 +2250,34 @@ msgstr ""
 "IPv6가 가능한 네트워크에 접속할 때, 이 연결이 IPv4 설정이 실패하도라도 IPv6 "
 "설정에 성공시 연결을 마무리합니다."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "라우팅(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "사용안함"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "사용(공용 주소 선호)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "사용(임시 주소 선호)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "안정된 프라이버시"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2221,20 +2287,20 @@ msgstr ""
 "메인 서버를 사용하려면 쉼표로 구분하십시오. 링크 로컬 주소는 자동으로 연결된 "
 "인터페이스로 취급합니다."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 #, fuzzy
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 개인 보안 확장(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "이 연결이 되려면 IPv6 주소 부여 필요(_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2242,50 +2308,50 @@ msgstr ""
 "IPv4 가능한 네트워크에 연결할 때, 이 연결이 IPv6 설정은 실패하고, IPv4 설정"
 "은 성공한 경우라도 연결을 마무리합니다."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "검사"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "엄격한"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "MACsec 장치의 이름입니다."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 "이 MACSEC 인터페이스를 작성해야하는 상위 인터페이스 이름 또는 상위 연결 UUID."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 "이 MACsec 인터페이스를 생성해야하는 부모 인터페이스 이름 또는 부모 연결 UUID"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " 미리 공유 된 연결 연관 키 이름"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "미리 공유 된 연결 연결 키"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2295,210 +2361,210 @@ msgstr ""
 "방법을 지정합니다. EAP 모드의 경우 802.1X 보안 페이지에서 매개 변수를 채 웁니"
 "다."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "수신 프레임에 대한 유효성 검사 모드를 지정합니다."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "암호화"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "전송 된 트래픽을 암호화해야하는지 여부"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "SCI (보안 채널 식별자)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "기본"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
 msgid "Nu_mber"
 msgstr "번호(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "고급"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 #, fuzzy
 msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
 msgid "N_etwork ID"
 msgstr "네트워크 이름(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "바꾸기..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 #, fuzzy
 msgid "P_IN"
 msgstr "PIN(_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "홈 네트워크가 사용 불가능할 경우 로밍을 허용(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "암호 보이기(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "인증"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 #, fuzzy
 msgid "Allowed methods"
 msgstr "허용된 방식:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "방식 설정(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "압축"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "포인트투포인트 암호화(MPPE) 사용(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128비트 암호화 사용(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "상태가 있는 MPPE 사용(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD 데이터 압축을 허용"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate 데이터 압축을 허용"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP 헤더 압축 사용(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "에코"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP 에코 패킷 보내기(_E)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "없음 "
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "브라우저 전용"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "브라우저 클라이언트 / 스키마에만이 프록시 구성을 사용하십시오."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "PAC 스크립트를 가져올 URL입니다."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "파일에서 팀 설정 가져오기(_I)..."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 #, fuzzy
 msgid "Method"
 msgstr "방식(_M):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "고급"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "마스터로 설정"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "이더넷 네트워크"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "팀 고급 옵션"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2506,21 +2572,21 @@ msgstr ""
 "포트가 활성화되거나 비활성화 된 후 원치 않는 NAs 및 gratuitous ARP 패킷의 버"
 "스트 수."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "이 포트를 매핑해야하는 대기열의 ID입니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "액티브 백업 러너 옵션"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
 msgid "_Port priority"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2528,34 +2594,34 @@ msgstr ""
 "값은 밀리 초 단위의 양수입니다. 피어 투 피어 패킷의 버스트 간 간격을 지정합니"
 "다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "포트 우선 순위. 숫자가 높을수록 우선 순위가 높아집니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _sticky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP 러너 옵션"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
 msgid "_LACP port priority"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
 msgid "LACP port _key"
 msgstr "비밀키(_K):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2563,15 +2629,15 @@ msgstr ""
 "포트가 활성화되거나 비활성화 된 후 전송 된 멀티 캐스트 그룹 재 참여 요청의 버"
 "스트 수입니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 "LACP 표준에 따른 포트 우선 순위. 숫자가 낮을수록 우선 순위가 높아집니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2579,59 +2645,59 @@ msgstr ""
 "값은 밀리 초 단위의 양수입니다. 멀티 캐스트 그룹 재 참여 요청의 버스트 간 간"
 "격을 지정합니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr "LACP 표준에 따른 포트 키. 같은 키로 포트를 집계하는 것만 가능합니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
 msgid "_Up delay"
 msgstr "연결 지연 시간(_U):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
 msgid "_Down delay"
 msgstr "해제 지연 시간(_D):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
 msgid "Send _interval"
 msgstr "상위 인터페이스(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 #, fuzzy
 msgid "_Source host"
 msgstr "ARP 대상(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
 msgid "_Target host"
 msgstr "ARP 대상(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2639,27 +2705,27 @@ msgstr ""
 "누락 된 최대 응답 수입니다. 이 수가 초과되면 링크가 작동 중지 된 것으로보고됩"
 "니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr "소스 주소로 ARP 요청에 채워질 IP 주소로 변환 될 호스트 이름."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr "요청에 목적지 주소로 채워질 IP 주소로 변환 될 호스트 이름."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2667,13 +2733,13 @@ msgstr ""
 "활성 포트에서 수신 된 ARP 패킷의 유효성을 검사합니다. 이 옵션을 선택하지 않으"
 "면 들어오는 모든 ARP 패킷이 올바른 응답으로 간주됩니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "i_nactive 포트에서 잘못된 패킷을 무시하십시오."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2681,13 +2747,13 @@ msgstr ""
 "비활성 포트에서 수신 된 ARP 패킷의 유효성을 검사합니다. 이 옵션을 선택하지 않"
 "으면 들어오는 모든 ARP 패킷이 올바른 응답으로 간주됩니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "비활성 포트의 S_end"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2695,185 +2761,184 @@ msgstr ""
 "기본적으로 ARP 요청은 활성 포트에서만 전송됩니다. 이 옵션은 비활성 포트에서"
 "도 전송할 수 있습니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "전송되는 요청 간의 간격."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "링크 감시 초기화와 전송 된 첫 번째 요청 간의 지연."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "사용할 링크 감시자입니다."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "링크 감시자"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "파일에서 팀 설정 가져오기(_I)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
 msgid "Edit _JSON configuration"
 msgstr "_JSON 설정:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "원시 구성"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "최우선 순위"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "최우선 순위 (안정)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "모음 대역폭:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "가장 많은 수의 포트"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "우선 순위"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "이더넷"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "활성 포트에서"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "활성에서 팀 장치로"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
 msgid "_Teamed connections"
 msgstr "팀 연결(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "로드 밸런스"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "이더넷"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "가상 LAN"
 
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP "
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "모든 L3 프로토콜"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "모든 L4 프로토콜"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
 msgid "_Hardware Address"
 msgstr "하드웨어 주소:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
 "새 팀 장치의 원하는 하드웨어 주소입니다. 일반적인 MAC 주소 형식이 허용됩니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
 msgid "_Hardware address policy"
 msgstr "하드웨어 주소:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "사용할 러너의 이름."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2881,11 +2946,11 @@ msgstr ""
 "팀 수명 동안 팀 장치 및 포트 장치의 하드웨어 주소를 설정하는 방법에 대한 정책"
 "을 정의합니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "_ 주기적으로 LACPDU 프레임 전송"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2893,11 +2958,11 @@ msgstr ""
 "선택하면 LACPDU 프레임이 구성된 링크를 따라 주기적으로 전송됩니다. 그렇지 않"
 "은 경우, \"말할 때 말할 수있는\"역할을합니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "LACPDU 프레임 전송 _ 초"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2906,24 +2971,24 @@ msgstr ""
 "Option은 링크 파트너가 LACPDU 패킷을 전송하도록 요청하는 속도를 지정합니다. "
 "선택하면 패킷이 초당 한 번 전송됩니다. 그렇지 않으면 30 초마다 전송됩니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
 msgid "_System priority"
 msgstr "우선 순위(_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "시스템 우선 순위, 값은 0 - 65535 일 수 있습니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2931,207 +2996,203 @@ msgstr ""
 "마스터 인터페이스에서 캐리어를 지정하기 전에 활성화되어야하는 최소 포트 수를 "
 "지정합니다. 값은 1 - 255입니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "그러면 집계자가 선택되는 방법에 대한 정책이 선택됩니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr "패킷 Tx 해시 계산에 사용해야하는 조각 유형 (문자열) 목록입니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "전송 해시 용 _ 필드"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "10 분의 1 초. 재조정 사이의주기 간격."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "활성 Tx 밸런서의 이름입니다. Active Tx balancing은 기본적으로 비활성화되어 있"
 "습니다."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
 msgid "Transmission _balancing interval"
 msgstr "전송 출력(_W):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
 msgid "_Transmission balancer"
 msgstr "전송 출력(_W):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "달리는 사람"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
 msgid "_Parent interface"
 msgstr "상위 인터페이스(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
 msgid "VLAN inter_face name"
 msgstr "가상 LAN 인터페이스 이름(_N):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
 msgid "Cloned MAC _address"
 msgstr "복제한 MAC 주소(_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 #, fuzzy
 msgid "VLAN _id"
 msgstr "가상 LAN 아이디(_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_ 헤더 헤더 다시 정렬"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Loose 바인딩"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "장치 이름 + 번호"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 번호"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
 msgid "S_ecurity"
 msgstr "보안(_E):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "클라이언트"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "핫스팟"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "애드혹"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 #, fuzzy
 msgid "Transmission po_wer"
 msgstr "전송 출력(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 #, fuzzy
 msgid "_Rate"
 msgstr "레이트(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 #, fuzzy
 msgid "_BSSID"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 #, fuzzy
 msgid "C_hannel"
 msgstr "채널(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 #, fuzzy
 msgid "Ban_d"
 msgstr "밴드(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 #, fuzzy
 msgid "SS_ID"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "조치를 수행하기위한 폴 키트 승인이 없습니다."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "허용된 인증 방식"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "암호 인증 프로토콜"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -3140,67 +3201,65 @@ msgstr ""
 "대부분의 경우 서비스 업체의 PPP 서버는 모든 인증 방법을 지원합니다. 만약 연결"
 "이 실패하면, 몇몇 방법을 사용하지 않아 보십시오."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "와이파이"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "블루투스"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "인피니밴드"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "본딩"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "팀"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "브릿지"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP 터널"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "가상 사설망"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
@@ -3209,154 +3268,150 @@ msgstr ""
 "\n"
 "오류: 가상 사설망 서비스 유형이 없음"
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "가져올 파일"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "가상"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "저장한 가상 사설망 설정 가져오기..."
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "연결 에디터 창을 알려지지 않은 오류 때문에 열 수 없습니다."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "새로운 연결을 만들 수 없음"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "연결 제거가 실패했습니다"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s 연결을 정말로 제거하시겠습니까?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 #, fuzzy
 msgid "_New Connection"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "주소"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "넷마스크"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "게이트웨이"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "매트릭"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "접두어"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "이름 없는 연결을 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "연결 이름(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "에디터 초기화 중 오류"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "설정이 잘못되었습니다. %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "연결 편집 창에서 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니다.)"
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "이 연결에 대해 바뀐 사항을 저장합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "이 컴퓨터의 모든 사용자에게 이 연결을 적용하도록 인증합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "연결을 만들 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "연결을 변경할 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "연결 편집 대화 창 만들기에 알 수 없는 오류."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3364,255 +3419,255 @@ msgstr ""
 "경고 : 연결에는 편집기에서 지원하지 않는 일부 속성이 포함되어 있습니다. 그들"
 "은 구원받을 때 지워질 것입니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "에디터 초기화 중 오류"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "고치다"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "참이면 CA 인증서가 EAP 인증이 되었는지 경고를 하지 않습니다."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
 msgid "Connection _name"
 msgstr "연결 이름(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "내보내기(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "파일 레이블"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Relabel"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 "다음 파일은 인증서 인증에 사용할 레이블이 없습니다. 라벨을 조정 하시겠습니까?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "라벨 바꾸기"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "파일 이름"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "하지 않음"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "지금"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d일 전"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d년 전"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "연결을 삭제할 수 없습니다."
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "편집 할 연결 선택"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "삭제할 연결 선택"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "이름"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "마지막 사용"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "선택한 연결을 고칩니다"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "선택된 연결을 변경하도록 인증합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "선택한 연결 삭제"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "선택한 연결을 삭제하도록 인증"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, fuzzy, c-format
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
 msgid "Unrecognized connection type"
 msgstr "지원하지 않는 모바일 광대역 연결 종류."
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, fuzzy, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 #, fuzzy
 msgid "Error importing connection"
 msgstr "연결을 편집하는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "연결을 만드는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 #, fuzzy
 msgid "Connection type not specified."
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "VPN 플러그인을 하나도 설치하지 않았습니다."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "연결을 편집하는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID가 '%s'인 연결을 찾을 수 없습니다"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "네트워크 연결"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "새 연결 추가"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X 보안"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "이 연결에 802.1X 보안을 사용(_X)"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Bluetooth 장치의 MAC 주소입니다. 예 : 00 : 11 : 22 : 33 : 44 : 55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "잘못된 블루투스 기기 (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "본딩 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "블루투스"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Bluetooth 연결 프로파일의 유형을 선택하십시오."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "이더넷 네트워크"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "와이파이 네트워크"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "주요"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "본딩 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "브릿지 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "브릿지 네트워크 연결 %d"
@@ -3620,36 +3675,36 @@ msgstr "브릿지 네트워크 연결 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "브릿지 포트"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "브릿지 네트워크 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "부모 인터페이스가 누락되었습니다."
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 연결 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3659,43 +3714,42 @@ msgstr ""
 "이 옵션을 사용하면 이 연결은 여기 입력한 MAC 주소로 지정한 네트워크 장치에만 "
 "해당됩니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "무시함"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "이더넷 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "이더넷 장치"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "복제한 MAC 주소(_L):"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN 암호"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "이더넷 연결 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "기본"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3705,11 +3759,11 @@ msgstr ""
 "방화벽 안의 기본 구역을 사용합니다. firewalld를 사용할 때만 사용할 수 있습니"
 "다."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "일반 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3720,169 +3774,161 @@ msgstr ""
 "이 옵션을 사용하면 이 연결은 여기 입력한 MAC 주소로 지정한 네트워크 장치에만 "
 "해당됩니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "인피니밴드 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "인피니 밴드 장치"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "인피니밴드 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "이더넷 연결 %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "자동(가상 사설망)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "자동(가상 사설망), 주소만"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "주소만 자동"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "자동(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "주소만 자동(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "자동(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "주소만 자동(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "연결-로컬 연결만"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
 msgid "Additional DNS ser_vers"
 msgstr "추가 DNS 서버(_V):"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
 msgid "Additional s_earch domains"
 msgstr "추가 검색 도메인(_E):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s의 IPv4 경로 편집 중"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 설정"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 주소 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 주소 넷 마스크 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 게이트웨이 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS 서버 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "자동, DHCP만 사용"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s의 IPv6 경로 편집"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 설정"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 주소 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 접두어 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 게이트웨이 \"%s\"invalid"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS 서버 \"%s\"invalid"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "MACsec 사용자 인터페이스를로드 할 수 없습니다."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC 연결 %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "슬레이브 중복"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "'%s' 및 '%s' 슬레이브가 모두 '%s' 장치에 적용됩니다"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3891,25 +3937,25 @@ msgstr ""
 "'%s' 및 '%s' 슬레이브가 같은 물리적 장치의 다른 가상 포트('%s' 및 '%s')에 적"
 "용됩니다."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s 슬레이브 %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "모바일 광대역 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "지원하지 않는 모바일 광대역 연결 종류."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "모바일 광대역 통신사 종류를 선택하십시오"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3918,88 +3964,86 @@ msgstr ""
 "모바일 광대역 통신사가 사용하는 기술을 선택하십시오. 확실하지 않은 경우 통신"
 "사에 문의하십시오."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "통신사가 _GSM 기반의 기술을 사용합니다(예: GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "통신사가 C_DMA 기반의 기술을 사용합니다(예: 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "없음"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s에 대한 PPP 인증 방법을 변경하십시오"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP 설정"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "프록시"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "오류: 파일에 올바른 JSON 설정이 들어 있지 않습니다"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "팀 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "팀 연결 %d"
@@ -4007,69 +4051,69 @@ msgstr "팀 연결 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "팀 포트"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:413
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (\"%s\" 통해)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "네트워크 연결 없음"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "가상 LAN 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "VLAN 상위"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "가상 LAN 연결 %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "연결에 실패"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "가상 사설망 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, fuzzy, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "가상 사설망 연결 %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "가상 사설망 연결 종류 선택"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -4080,7 +4124,7 @@ msgstr ""
 "연결 종류가 목록에 없으면, 가상 사설망 플러그인이 제대로 설치되지 않았을 수"
 "도 있습니다."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -4089,7 +4133,7 @@ msgstr ""
 "이 선택 사항은 이 연결이 여기 입력한 BSSID로 지정되는 와이파이 억세스 포인트"
 "(AP)에만 국한되도록 고정합니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -4099,96 +4143,94 @@ msgstr ""
 "이 옵션을 사용하면 이 연결은 여기 입력한 MAC 주소로 지정한 네트워크 장치에만 "
 "해당됩니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "와이파이 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "모든 장치"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "와이파이 연결 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128비트 키(Hex 또는 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "동적 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "기업용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다. 와이파이 설정이 없습"
 "니다."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "와이파이 보안"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "SSID 누락"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Ad-Hoc 모드와 호환되지 않는 보안"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "이름이 \"%s\"인 파일이 이미 있습니다."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "바꾸기(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s 파일을 저장하려는 가상 사설망 연결로 바꾸시겠습니까?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN 연결을 내보낼 수 없음"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4199,120 +4241,107 @@ msgstr ""
 "\n"
 "오류: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "가상 사설망 연결 내보내기..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "잠금 해제(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "이 장치 자동으로 잠금 해제"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "연결 정보"
 
 # translation auto-copied from project subscription-manager, version 1.11.X, document keys
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "종료(_C)"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "사용 중인 네트워크 연결"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "키가 설정되지 않았습니다."
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "비밀키(_K):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "비밀키 암호(_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "사용자 인증서(_U):"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "내 나라가 목록에 없습니다"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "목록에없음"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "내 요금제가 목록에 없습니다..."
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "통신사"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "국가 혹은 지역"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "설치된 GSM 장치"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "설치된 CDMA 장치"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "모든 장치"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "새 모바일 광대역 연결"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4320,85 +4349,71 @@ msgstr ""
 "이 도우미를 이용해 휴대전화(3G) 네트워크를 사용하는 모바일 광대역 연결을 손쉽"
 "게 설정할 수 있습니다."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "다음 정보가 필요합니다:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "통신사의 이름"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "통신사의 요금제 이름"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(어떤 경우엔) 통신사의 요금제 APN (AP 이름)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "이 모바일 광대역 장치에 대한 연결 만들기(_T):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "모바일 광대역 연결을 설정"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "국가 혹은 지역 목록:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "국가 혹은 지역"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 #, fuzzy
 msgid "Choose your Provider’s Country or Region"
 msgstr "통신사의 국가 혹은 지역 선택"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "목록에서 통신사 선택(_L):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "통신사가 없으므로 직접 입력(_M):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "내 통신사는 GSM 기반 기술을 사용합니다(GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "내 통신사는 CDMA 기반 기술을 사용합니다(1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "통신사를 선택하십시오"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "요금제 선택(_S):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "요금제 _APN(억세스 포인트 이름):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
@@ -4411,37 +4426,31 @@ msgstr ""
 "\n"
 "만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "요금제를 선택하십시오"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "모바일 광대역 연결이 다음과 같이 설정되었습니다:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "장치:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "통신사:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "요금제:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
 #, fuzzy
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
@@ -4455,229 +4464,236 @@ msgstr ""
 "역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연결\"을 "
 "선택하십시오."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "모바일 광대역 설정 확인"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(없음)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "열쇠 입력 %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA 인증서(_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(알 수 없음)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "선택 "
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "취소 "
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "파일에서 선택 ..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "개인 인증서 선택..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
 msgid "%s certificate _password"
 msgstr "사용자 인증서(_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "로그인 오류 : "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "연결을 편집하는데 오류"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "잠금 해제(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "발급자"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "들어가다 %s 핀"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "로그인(_L)"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Remember PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "이 사용자에 대해서만 암호 저장(_U)"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "모든 사용자에 대해 암호 저장(_A)"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "매번 이 암호 물어보기"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s'에 연결하려면 암호가 필요합니다."
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "암호 보이기(_O)"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "보조 암호(_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "보조 암호(_S):"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "암호(_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "연결 끊김"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "새로운…"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "없음"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "동적 WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "와이파이 네트워크 인증이 필요합니다"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "와이파이 네트워크에 인증이 필요합니다"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "새 와이파이 네트워크 만들기"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "새 와이파이 네트워크"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "감춰진 와이파이 네트워크에 연결"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "숨겨진 와이파이 네트워크"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
 msgid "Wi-Fi _security"
 msgstr "와이파이 보안(_S):"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
 msgid "C_onnection"
 msgstr "연결 이름(_O):"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
 msgid "Wi-Fi _adapter"
 msgstr "와이파이 어댑터(_A):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 #, fuzzy
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "통신사가 없으므로 직접 입력(_M):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "통신사:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "국가 혹은 지역 목록:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "국가 혹은 지역"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "유선"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC 메쉬"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4687,13 +4703,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4701,27 +4717,27 @@ msgstr ""
 "암호가 누락되었거나 연결이 유효하지 않습니다. 후자의 경우 먼저 nm-connection-"
 "editor를 사용하여 연결을 편집해야합니다"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "와이파이 보안(_S):"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "네트워크 이름(_N):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "연결 이름(_O):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "와이파이 어댑터(_A):"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "사용법:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4729,7 +4745,7 @@ msgstr ""
 "이 프로그램은 네트워크 관리(https://wiki.gnome.org/Projects/NetworkManager/)"
 "의 일부분입니다."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4737,354 +4753,352 @@ msgstr ""
 "이 프로그램은 명령행에서 실행되는 프로그램이 아니라, 그놈 데스크톱 환경에서 "
 "실행하는 프로그램입니다."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "사용하지 않음"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "등록되지 않음"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "가정 네트워크(%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "가정 네트워크"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "검색중"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "등록이 거부되었습니다"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s 로밍)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (로밍)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "로밍 네트워크(%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "로밍 네트워크"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%2$s'의 SIM 카드 '%1$s'에 대한 PIM 코드"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN 코드가 필요합니다"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN 코드가 모바일 광대역 장치를 위해 필요합니다"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "모바일 광대역 연결 '%s' 사용 중: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "로밍"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s 연결"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, 또는 PKCS#12 비밀 키(*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X 보안에서 정의되지 않은 오류 (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 #, fuzzy
 msgid "no CA certificate selected"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "선택한 CA 인증서 파일이 존재하지 않습니다."
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC 파일이 누락되었습니다."
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC 파일 선택..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC 파일(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "모든 파일"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "익명"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "인증함"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "둘 다"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "익명 사용(_M):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 파일(_F):"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "내부 인증(_I):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "자동 PAC 인증 허용(_V)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP 사용자 이름 누락"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "누락 된 EAP-LEAP 암호"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "버전 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "버전 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 버전(_V):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "서버 인증서 이름의 접미사입니다."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "EAP 사용자 이름 누락"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "누락 된 EAP 암호"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "암호 보이기(_O)"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS 신원 누락"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA 인증서 불필요(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "선택한 사용자 인증서 파일이 존재하지 않습니다."
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "선택된 키 없음"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "선택한 키 파일이 존재하지 않습니다."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
 msgid "I_dentity"
 msgstr "인증 정보(_D):"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1X 보안을 확인하는 알 수없는 오류"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
 # NOTE: 무선랜 인증방식. '빠르게' 라고 번역하지 말것.
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "터널링을 사용하는 TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "보호되는 EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
 msgid "Au_thentication"
 msgstr "인증(_T):"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "누락 된 사용자 이름"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "누락 된 도약 - 암호"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-key 누락"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "잘못된 wep-key : 길이가있는 키 %zu 16 진수 만 포함해야합니다."
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "잘못된 wep-key : 길이가있는 키 %zu ASCII 문자 만 포함해야합니다."
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5093,41 +5107,41 @@ msgstr ""
 "잘못된 wep-key : 잘못된 키 길이 %zu. 키는 길이 5/13 (ascii) 또는 10/26 (hex) "
 "중 하나 여야합니다."
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "잘못된 wep-key : 암호가 비어 있어야합니다."
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "잘못된 wep-key : 암호는 64 자보다 짧아야합니다."
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "열린 시스템"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "공유 키"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (기본값)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
 msgid "_Key"
 msgstr "키(_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "키 표시(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 인덱스(_X):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5136,16 +5150,25 @@ msgstr ""
 "잘못된 wpa-psk : 잘못된 키 길이 %zu. [8,63] 바이트 또는 64 자리 16 진수 여야"
 "합니다."
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "유효하지 않은 wpa-psk : 16 진수로 64 바이트의 키를 해석 할 수 없습니다."
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
 msgid "_Type"
 msgstr "형식(_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (기본값)"
+
+#~ msgid "Ignored"
+#~ msgstr "무시함"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "사용 중인 네트워크 연결"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다."
 
diff --git a/po/ku.po b/po/ku.po
index dc2ec7bd..3cbce348 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-10-18 15:16+0200\n"
 "Last-Translator: Erdal Ronahî <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: Kurdish Team http://pckurd.net\n"
@@ -19,228 +20,250 @@ msgstr ""
 "X-Generator: Virtaal 0.6.1\n"
 "X-Launchpad-Export-Date: 2011-10-17 13:00+0000\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Tor"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Girêdanên torê yên xwe birêve bike"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Girêdanên torê"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Girêdanên torê yên çalak"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Girêdanên torê yên xwe birêve û sererast bike"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Damxe"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Sepanoka NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Girêdana torê tune"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Sepanoka NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr ""
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Girêdan"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Navê torê:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Bila girêdana VPN \"%s\" were rakirin?"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "negirêdayî"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Negirêdayî"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr ""
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -250,7 +273,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +283,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +292,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +302,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +311,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +320,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +329,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +338,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,14 +347,14 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "Girêdana VPN bi '%s' re"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -339,20 +362,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Peyaman têketina VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "Girêdana VPN biserneket"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -363,7 +386,7 @@ msgstr ""
 "Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
 "holê"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -372,627 +395,656 @@ msgid ""
 "%s"
 msgstr "Girêdana VPN bi '%s' re"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "negirêdayî"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Veqetîne"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Amûrên torê ne amade ne"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Girêdanên _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN _veava bike..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Girêdana VPN a nû lê zêde bike"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager naxebite"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Tor hate neçalakkirin"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Torê çalak bike"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "_Bêqablo çalak bike"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Agahiya girêdanê"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Girêdanan sererast bike"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Der barê de"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Niha bi '%s' re girêdayî yî."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Negirêdayî"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Girêdana torê qut bu."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Girêdana torê '%s' tê amadekirin..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Ji bo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Girêdana torê '%s' çalak e"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Dest bi girêdana VPN ya '%s' dike"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Ji bo '%s' navnîşana VPN tê xwestin..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Girêdana VPN '%s' çalak e"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Girêdana torê tune"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Sepanoka NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Amade"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Girêdan pêkhat"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Niha di tora malê de qeyd bûyî."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 #, fuzzy
 msgid "You are now connected to the mobile broadband network."
 msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Torên biqablo (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Torên biqablo"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Tora biqablo"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Girêdana tora biqablo '%s' tê amadekirin..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Girêdana tora biqablo '%s' tê veavakirin..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Girêdana tora biqablo '%s' çalak e"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Li tora bêqablo ya veşartî girê bide..."
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(tune)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Girêdana torê tune"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Torên biqablo (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Tora biqablo"
 msgstr[1] "Tora biqablo"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "Tor hate neçalakkirin"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "Tora biqablo"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Tora bêqablo (%s)"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Dema girêdana bi tora bêqablo re çewtî derket"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Niha bi tora bêqablo '%s' re girêdayî yî."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Girêdana torê '%s' tê amadekirin..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Girêdana tora biqablo '%s' tê veavakirin..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Ji bo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Girêdana tora biqablo '%s' çalak e"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Bila girêdana VPN \"%s\" were rakirin?"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr ""
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP a dînamîk"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Navnîşan"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Tune"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (Standard)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Navnîşana IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr ""
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Rûpoşa Bintorê"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS ya Yekemîn:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS ya Duyemîn:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS ya Duyemîn:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Navrû"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr ""
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Ajoger"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Lez"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Ewlehî:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr ""
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Şîfre:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "Cure:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "Navê bikarhêner:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Girêdanên VPN"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "Girêdanên çalak tune!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "Sepanoka NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Şîfre:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 #, fuzzy
 msgid "SIM PIN unlock required"
 msgstr "Koda PIN pêwîst e"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 #, fuzzy
 msgid "SIM PIN Unlock Required"
 msgstr "Koda PIN pêwîst e"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1000,25 +1052,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Koda PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Koda PIN nîşan bide"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Vekirina SIM bi koda PUK pêwîst e"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1026,91 +1078,98 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Agahiya girêdanê"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Bila girêdana VPN \"%s\" were rakirin?"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Biafirîne..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Cureyê girêdana VPN hilbijêre"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1118,650 +1177,799 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Servîs:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Girêdanên VPN"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Sererastkirin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Navrû:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "DNS ya Yekemîn:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bayt"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_Ewlehî:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Girêdanên VPN"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Torê çalak bike"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "bixweber"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "standard"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Navnîşan"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Navnîşan"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "_Servîs:"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Navê Bikarhêner:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servîs:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Şîfreyê _nîşan bide"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "Şî_fre:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Navrû"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Navrû:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Navrû:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Bixweber"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Servîs:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
-msgstr ""
+msgid "C_loned MAC address"
+msgstr "Navnîşan"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Şî_freya mifteya taybet:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Şî_freya mifteya taybet:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Lez:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Tune"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Agahiya girêdanê"
+msgid "_Metered connection"
+msgstr "Girêdanên VPN"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Bixweber _girêbide"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1769,1392 +1977,1547 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Navnîşan"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_Girêdan"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Servîs:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 #, fuzzy
 msgid "Remote IP"
 msgstr "_Rake"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Rêbaz:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Pêşkêşkarên _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Bêbandorkirî"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "Î_dhalat"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Pêşketî"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_ID ya torê:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Guhartin..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Şîfreyan _nîşan bide"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+msgid "Allowed methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Rêbaz:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Tune"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Rêbaz:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Pêşketî"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Torên biqablo"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Ewlehî:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Ewlehî:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Ewlehî:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Mifteya _taybet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Navrû:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Ewlehî:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Girêdanên VPN"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Tora biqablo (%s)"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Navnîşana IP:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
-msgstr ""
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
+msgstr "Navnîşana IP:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Ewlehî:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Navrû:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Navrû:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
+msgstr "Navnîşan"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Ewlehî:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_t:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../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."
-msgstr ""
-
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
-msgid "Select file to import"
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Girêdana VPN sererast bike"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "Girêdanên torê yên xwe kontrol bike"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 #, fuzzy
 msgid "Connection delete failed"
 msgstr "Girêdan pêkhat"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Girêdanên _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Navnîşan"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Rûpûşa torê"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 #, fuzzy
 msgid "Editing un-named connection"
 msgstr "Girêdana VPN sererast bike"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Navê _girêdanê:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Tomarkirin"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Girêdanên torê yên xwe kontrol bike"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "Girêdana torê tune"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Navê _girêdanê:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "Î_xracat"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "tu car"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "niha"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d xulek berê"
 msgstr[1] "%d xulek berê"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d saet berê"
 msgstr[1] "%d saet berê"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d roj berê"
 msgstr[1] "%d roj berê"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d meh berê"
 msgstr[1] "%d meh berê"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d sal berê"
 msgstr[1] "%d sal berê"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Lêzêdekirina girêdanê biserneket"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Girêdana torê biqablo %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Girêdana torê biqablo %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nav"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "Girêdana VPN ya hilbijartî sererast bike"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Girêdana VPN ya hilbijartî jê bibe"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Girêdana VPN ya hilbijartî jê bibe"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Girêdana VPN ya hilbijartî jê bibe"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Girêdana torê biqablo %d"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Girêdanên torê yên xwe kontrol bike"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Lêzêdekirina girêdanê biserneket"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Girêdanên torê yên xwe kontrol bike"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Girêdanên torê"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Girêdana VPN a nû lê zêde bike"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Tê_keve torê"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Tora bêqablo (%s)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS ya Yekemîn:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Girêdana torê biqablo %d"
@@ -3162,85 +3525,89 @@ msgstr "Girêdana torê biqablo %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Navrû:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Girêdana DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Girêdana torê biqablo %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3248,270 +3615,268 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Bixweber (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Bixweber (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Bixweber (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "Pêşkêşkarên _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
-msgstr ""
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
+msgstr "Pêşkêşkarên _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Girêdana DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "tune"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Girêdana torê biqablo %d"
@@ -3519,177 +3884,175 @@ msgstr "Girêdana torê biqablo %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Girêdana torê tune"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Girêdana VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Girêdana VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Cureyê girêdana VPN hilbijêre"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Mifteya WEP a 40/128-bit (Hex an ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Şîfreya WEP a 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP a dînamîk (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Ewlehiya bêqablo:"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "Nikarî girêdana VPN lê zêde bike"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3697,466 +4060,446 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Girêdana VPN sererast bike"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Kîlît rake"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Agahiya girêdanê"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Girêdanên torê yên çalak"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Mifteya _taybet:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Şî_freya mifteya taybet:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(tune)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Kîlît rake"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "Şî_fre:"
+msgid "Sh_ow passwords"
+msgstr "Şîfreyan _nîşan bide"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "Şî_fre:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "Şîfreyan _nîşan bide"
+msgid "_Secondary Password:"
+msgstr "Şî_fre:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "Şî_fre:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Veqetîne"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tune"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP a dînamîk (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Afirandin"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Niha bi tora bêqablo '%s' re girêdayî yî."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Mifteya tora bêqablo pêwîst e"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Tora bêqablo ya nû"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Li tora bêqablo ya veşartî girê bide..."
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Tora bêqablo ya veşartî"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Ewlehiya bêqablo:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Girêdan:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4166,17 +4509,40 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Ewlehiya bêqablo:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Navê torê:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Girêdan:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Bikaranîn:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4184,417 +4550,432 @@ msgstr ""
 "Ev bername beşeke NetworkManager'ê ye (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "neçalakkirî"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ne tomarkirî"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Tora malê (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Tora malê"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "lê digere"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "Tora biqablo"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Koda PIN pêwîst e"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Girêdanên VPN"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+msgid "_Inner authentication"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "No CA certificate is _required"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Şîfreya WEP a 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Şîfreyan _nîşan bide"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sertîfikaya _bikarhêner:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Nasname:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+msgid "Au_thentication"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Standard)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Pergalê vekirî"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Mifteya parvekirî"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Standard)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Mifte:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Mifteyê _nîşan bide"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Ende_ksa WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Cure:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (Standard)"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Agahiya girêdanê"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Sepanoka NetworkManager"
 
@@ -4621,15 +5002,6 @@ msgstr "_Cure:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #, fuzzy
 #~ msgid "FirewallD is not running."
 #~ msgstr "NetworkManager naxebite..."
@@ -4683,13 +5055,6 @@ msgstr "_Cure:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS ya Duyemîn:"
-
-#, fuzzy
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS ya Duyemîn:"
-
 #~ msgid "_Help"
 #~ msgstr "_Alîkarî"
 
@@ -4714,13 +5079,6 @@ msgstr "_Cure:"
 #~ msgid "_Save..."
 #~ msgstr "_Tomar bike..."
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Bixweber _girêbide"
-
-#, fuzzy
-#~ msgid "_Import"
-#~ msgstr "Î_dhalat"
-
 #~ msgid "Error saving connection"
 #~ msgstr "Nikarî girêdanê tomar bike"
 
@@ -4738,10 +5096,6 @@ msgstr "_Cure:"
 #~ msgstr "Çewtiya %s"
 
 #, fuzzy
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Bila girêdana VPN \"%s\" were rakirin?"
-
-#, fuzzy
 #~ msgid "failed to connect to the phone."
 #~ msgstr "Niha bi tora biqablo re girêdayî yî."
 
diff --git a/po/lt.po b/po/lt.po
index 8d67eb8e..23ef38a9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-12-06 09:38+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-12-08 14:39+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
@@ -25,100 +25,109 @@ msgstr ""
 "X-Generator: Gtranslator 3.30.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Tinklas"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Tvarkyti tinklo ryšius"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#| msgid "Raw Configuration"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 msgid "Advanced Network Configuration"
 msgstr "Sudėtingesnė tinklo konfigūracija"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Tvarkykite ir keiskite savo tinklo ryšių nustatymus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Išjungti pranešimus apie prisijungimą"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
 "jungiantis prie tinklo."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Išjungti pranešimus apie atsijungimą"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Nustatykite į teigiamą, jei nepageidaujate, kad būtų rodomi pranešimai "
 "atsijungus nuo tinklo."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Išjungti VPN pranešimus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 "Nustatykite teigiamą, jei norite išjungti pranešimus atsijungiant nuo VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Slėpti „yra atvirų tinklų“ pranešimus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Nustatykite į teigiamą, jei norite išjungti pranešimus, rodomus esant "
 "prieinamų belaidžio ryšio tinklų."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Antspaudas"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Naudojama norint nustatyti, ar nustatymai turėtų būti perkelti į naują "
 "versiją."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Išjungti belaidžių tinklų kūrimo galimybę"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Nustatykite į teigiamą, jei norite išjungti „adhoc“ tinklų kūrimo galimybę "
 "naudojant šį įtaisą."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Rodyti įtaisą pranešimų vietoje"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "Nustatykite NEIGIAMĄ įtaiso rodymui pranešimų vietoje išjungti."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Nepaisyti LĮ liudijimo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -126,7 +135,7 @@ msgstr ""
 "Nustatykite teigiamą, norėdami išjungti įspėjimus apie LĮ liudijimus EAP "
 "tapatybės nustatyme."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -134,15 +143,15 @@ msgstr ""
 "Nustatykite teigiamą, norėdami išjungti įspėjimus apei LĮ liudijimus antroje "
 "EAP tapatybės nustatymo fazėje."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager ryšio redaktorius"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -150,7 +159,7 @@ msgstr ""
 "NetworkManager yra sisteminė tarnyba tinklo ryšių bei įrenginių valdymui bei "
 "konfigūravimui."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -158,21 +167,21 @@ msgstr ""
 "nm-connection-editor programa dirba su NetworkManager ryšių profilių kūrimui "
 "bei redagavimui."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager kūrėjai"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "objekto klasė „%s“ neturi savybės, pavadinimu „%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "savybė „%s“, kuri priklauso klasei „%s“ nėra skirta rašymui"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -180,19 +189,19 @@ msgstr ""
 "konstruktoriaus savybė „%s“, kuri priklauso objektui „%s“, negali būti "
 "nustatyta po sukonstravimo"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "„%s::%s“ nėra tinkamas savybės pavadinimas; „%s“ nėra GObject potipis"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "nepavyko nustatyti savybės „%s“, priklausančios tipui „%s“ iš „%s“ tipo "
 "reikšmės"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -201,81 +210,80 @@ msgstr ""
 "reikšmė „%s“, kuri priklauso tipui „%s“, yra netinkama arba už savybės „%s“, "
 "priklausančios tipui „%s“, ribų"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X tapatybės nustatymas"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1097
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1103
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Prisi_jungti"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Tinklo pavadinimas"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "saugus."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Nepavyko pridėti / suaktyvinti ryšio"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Ryšio problema"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Nepavyko atjungti įrenginio"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Nepavyko atsijungti"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Nepavyko suaktyvinti ryšio"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Daugiau neberodyti šio pranešimo"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +293,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ atsijungė, kadangi buvo nutrauktas tinklo ryšys."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +303,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi buvo nutrauktas tinklo ryšys."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +312,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi VPN tarnyba netikėtai sustojo."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -314,7 +322,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi VPN tarnyba grąžino netinkamą konfigūraciją."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +331,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi baigėsi bandymo prisijungti laiko limitas."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -332,7 +340,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi VPN tarnyba nebuvo paleista laiku."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -341,7 +349,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi VPN tarnybai nepavyko pasileisti."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +358,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi nebuvo tinkamų VPN paslapčių."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -359,7 +367,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko, kadangi buvo netinkamų VPN paslapčių."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -368,7 +376,7 @@ msgstr ""
 "\n"
 "VPN ryšys „%s“ nepavyko."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -379,19 +387,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ryšys sėkmingai užmegztas.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN ryšio pranešimas"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN ryšio klaida"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -404,7 +412,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -417,563 +425,574 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "įrenginys nepasiruošęs (trūksta aparatinės programinės įrangos)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "įrenginys nepasiruošęs"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "atjungta"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Atsijungti"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "įrenginys nevaldomas"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Tinklo įrenginių nerasta"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN ryšiai"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Konfigūruoti VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Pridėti VPN ryšį…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager programa nepaleista…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Tinklo sąsajos atjungtos"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Įjungti _tinklą"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Įjungti _belaidį"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Įjungti _mobilųjį plačiajuostį ryšį"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Įjungti p_ranešimus"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Ryšio _informacija"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Taisyti ryšius…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Esate prisijungę prie „%s“."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Atjungta"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Atsijungta nuo tinklo."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Ruošiamas tinklo ryšys „%s“…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Tinklo ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Užklausiamas tinklo adresas, skirtas „%s“…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Tinklo ryšys „%s“ aktyvus"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Pradedamas VPN ryšys „%s“…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Užklausiamas VPN adresas, skirtas „%s“…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN ryšys aktyvus"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nėra tinklo ryšio"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager įtaisas"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Neteisingas PUK kodas, susisiekite su savo paslaugų tiekėju."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Neteisingas PIN kodas, susisiekite su savo paslaugų tiekėju."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Siunčiamas atrakinimo kodas…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilusis plačiajuostis ryšys (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilusis plačiajuostis ryšys"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Prieinama"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Naujas mobilusis plačiajuostis ryšys…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Prisijungta"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Prisijungėte prie mobilaus plačiajuosčio ryšio."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilusis plačiajuostis tinklas."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Prisiregistravote namų tinkle."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Prisiregistravote kelionės tinkle."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Prisijungėte prie mobilaus plačiajuosčio ryšio."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Ruošiamas mobilusis plačiajuostis ryšys „%s“…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Konfigūruojamas mobilusis plačiajuostis ryšys „%s“…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Mobilusis plačiajuostis ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobilusis plačiajuostis ryšys „%s“ aktyvus"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatinis laidinis tinklas"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Laidiniai tinklai (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Laidiniai tinklai"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Laidinis tinklas"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Prisijungėte prie laidinio tinklo."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ruošiamas laidinis tinklo ryšys „%s“…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Konfigūruojamas laidinis tinklo ryšys „%s“…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Laidinis tinklo ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Užklausiamas laidinio tinklo adresas, skirtas „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Laidinis tinklo ryšys „%s“ aktyvus"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL tapatybės nustatymas"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_Gerai"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Prisijungti prie paslėpto belaidžio tinklo…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Sukurti _naują belaidį tinklą…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(nėra)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Nepavyko pridėti naujo ryšio"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Nepakanka teisių."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Belaidžiai tinklai (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Belaidis tinklas (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Belaidis tinklas"
 msgstr[1] "Belaidžiai tinklai"
 msgstr[2] "Belaidžiai tinklai"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Belaidis tinklas išjungtas"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Belaidis tinklas išjungtas aparatiškai"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Daugiau tinklų"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Yra belaidžių tinklų"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 "Norėdami prisijungti prie belaidžio tinklo, naudokite belaidžio tinklo meniu"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Esate prisijungę prie belaidžio tinklo „%s“."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Ruošiamas belaidis tinklo ryšys „%s“…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigūruojamas belaidis tinklo ryšys „%s“…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Belaidis tinklas „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Užklausiamas belaidžio tinklo adresas, skirtas „%s“…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Belaidžio tinklo ryšys „%s“ aktyvus: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Belaidis tinklo ryšys „%s“ aktyvus"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Nepavyko suaktyvinti ryšio"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Klaida rodant ryšio informaciją:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:968 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinaminis WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Daugiau adresų"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (numatytasis)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nežinoma"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP adresas"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Transliacijos adresas"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Potinklio kaukė"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Pirminis"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Antrinis slaptažodis:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Bendra"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Aparatinis adresas"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Tvarkyklė"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Sparta"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sauga:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Numatytasis maršrutas"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Nepaisoma"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Prieigos taškas"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Slaptažodis:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN tipas"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN tinklų sietuvas"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN naudotojo vardas"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN reklamjuostė"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Bazinis ryšys"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nežinoma"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nerasta tinkamų aktyvių ryšių!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -983,23 +1002,23 @@ msgstr ""
 "Autorių teisės priklauso © 2005-2008 Novell, Inc.\n"
 "ir daugeliui kitų bendruomenės pagalbininkų bei vertėjų"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Pranešimų vietos įtaisas jūsų tinklo įrenginiams ir ryšiams valdyti."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager tinklalapis"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Išvertė:\n"
 "Moo\n"
 "ir kiti."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1007,33 +1026,33 @@ msgstr ""
 "NetworkManager įtaisas nerado kai kurių reikalingų išteklių (nerastas .ui "
 "failas)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Trūkstami resursai"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobiliojo plačiajuosčio tinklo slaptažodis"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Norint prisijungti prie „%s“ reikalingas slaptažodis."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Reikalingas SIM PIN atrakinimas"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Reikalingas SIM PIN atrakinimas"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1043,25 +1062,25 @@ msgstr ""
 "reikalauja SIM PIN kodo."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kodas:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Rodyti PIN kodą"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Reikalingas SIM PUK atrakinimas"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Reikalingas SIM PUK atrakinimas"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1071,41 +1090,41 @@ msgstr ""
 "reikalauja SIM PUK kodo."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kodas:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Naujas PIN kodas:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Dar kartą įveskite naują PIN kodą:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Rodyti PIN/PUK kodus"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Ryšys neturi VPN nustatymo"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Nepavyko įrašyti ryšio į VPN UI: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Nepavyko įrašyti ryšio į VPN UI: neužbaigtas rašymas"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1113,41 +1132,41 @@ msgstr ""
 "IP adresai identifikuoja jūsų kompiuterį tinkle. Norėdami pridėti IP adresą, "
 "spustelėkite mygtuką „Pridėti“."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Pridėti"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "Pa_šalinti"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Nepaisyti automatiškai gautų maršrutų"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Naudoti šį _ryšį tik jo tinkle esantiems ištekliams"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1155,15 +1174,15 @@ msgstr ""
 "Jei įjungta, šis ryšys niekada nebus naudojamas kaip numatytasis tinklo "
 "ryšys."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "Suku_rti…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Pasirinkite ryšio tipą"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1175,84 +1194,93 @@ msgstr ""
 "Jei kuriate VPN ir  norimo VPN tipo nėra sąraše, gali būti neįdiegtas "
 "reikiamas VPN įskiepis."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "Į_renginys"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktyvi atsarginė kopija"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Transliacija"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptyvus perdavimo apkrovos balansavimas"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptyvus apkrovos balansavimas"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (rekomenduojama)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "Susieti _ryšiai"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "_Veiksena"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Taisyti"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Stebėjimo _dažnis"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Sąsajos pavad_inimas"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "_Saitų stebėjimas"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "ARP _tikslai"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1260,19 +1288,19 @@ msgstr ""
 "IP adresas arba kableliais skiriamas IP adresų sąrašas, kurių ieškoti "
 "tikrinant saitų būsenas."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "S_usiejimo delsa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Atsiejimo _delsa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Pirminis"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1280,66 +1308,69 @@ msgstr ""
 "Pirminio įrenginio sąsajos pavadinimas. Jei nustatyta, šis įrenginys bus "
 "visada aktyvus pavaldusis, kai prieinamas."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "baitai"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "Kelio _kaštai"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Prioritetas"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "_Hairpin veiksena"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Tinklų tiltais sujungti _ryšiai"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "_Persiuntimo delsa"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "Pasi_sveikinimo laikas"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP persiuntimo delsa, sekundėmis"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP pasisveikinimo laikas, sekundėmis"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Įjungti I_GMP šnipinėjimą"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1350,16 +1381,16 @@ msgstr ""
 "konfliktų, tuomet sistema gali atsisakyti įjungti šią ypatybę tol, kol nebus "
 "išspręsti konfliktai."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Įjungti _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr "Valdo, ar šiam tinklų tiltui yra įjungtas Spanning Tree Protocol (STP)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1368,27 +1399,27 @@ msgstr ""
 "žemiausio prioriteto tinklų tiltas bus pasirinktas kaip šakninis tinklų "
 "tiltas."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Didžiausias amžius"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Didžiausias STP pranešimo amžius, sekundėmis"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "_Senėjimo laikas"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Laidinio tinklo MAC adreso senėjimo laikas, sekundėmis"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Grupės _persiuntimo kaukė"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1400,40 +1431,40 @@ msgstr ""
 "nustatyti bitai 0, 1 ar 2, kadangi jie yra naudojami STP, MAC pristabdymo "
 "kadrams ir LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatinis"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "numatytasis"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "nenurodyta klaida"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Išlaikyti"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Nuolatinis"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Atsitiktinis"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabilus"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1443,181 +1474,224 @@ msgstr ""
 "tinklo įrenginiui, kuriame buvo aktyvuotas šis ryšys. Ši ypatybė yra žinoma "
 "kaip MAC klonavimas arba klastojimas. Pavyzdys: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC adresas"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "HW adresas"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "netinkamas %s %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "netinkamas %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "netinkamas %s sąsajos pavadinimas (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "netinkamas sąsajos pavadinimas (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "nepavyko išanalizuoti įrenginio pavadinimo"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "netinkamas aparatinis adresas"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "netinkamas %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "įrenginys"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "netinkamas %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Naudoti duomenų centro tinklų tilto sujungimą (DCB) šiam ryšiui"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Tėkmės valdymas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Savybė"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Įjungti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Paskelbti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Pageidaujantis"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritetas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Parametrai…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioritetų grupės"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Struktūra"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioritetinis tėkmės valdymas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Įjungti arba išjungti prioriteto pauzės perdavimą kiekvieno naudotojo "
 "prioritetui."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Eismo klasė"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Tiksli sparta"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Prioritetinė sparta"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Grupinė sparta"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Grupės ID"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Įveskite prioriteto grupės ID kiekvieno naudotojo prioritetui."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1625,35 +1699,35 @@ msgstr ""
 "Įveskite leidžiamą saito spartos procentinę dalį, kurią kiekviena prioritetų "
 "grupė galės naudoti. Visų grupių suma privalo būti 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Įveskite procentinę prioritetų grupės spartą kiekvienam naudotojo "
 "prioritetui."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Įjunkite arba išjunkite tikslią spartą kiekvienam naudotojo prioritetui."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Įveskite eismo klasę kiekvienam naudotojo prioritetui."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "_Naudotojo vardas"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Naudotojo vardas, naudojamas tapatybės patvirtinimui su PPPoE tarnyba."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1661,53 +1735,51 @@ msgstr ""
 "Inicijuoti tik seansus su prieigos koncentratoriais, kurie pateikia nurodytą "
 "tarnybą. Daugumai tiekėjų šis laukas turėtų būti paliktas tuščias."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Paslauga"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "R_odyti slaptažodį"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Slaptažodis, naudojamas tapatybės patvirtinimui su PPPoE tarnyba."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Slaptažodis"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "PPP _sąsaja"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Tėvinė sąsaja"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Bet koks pavadinimas, suteikiamas naujai sukurtai PPP sąsajai."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Sąsaja, kurioje bus sukurtas PPP ryšys."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "_Užimti sąsają"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1718,138 +1790,131 @@ msgstr ""
 "aktyvinti kito ryšio. Šį parametrą galima naudoti tik su Ethernet sąsajomis. "
 "nm-applet gali aktyvinti ryšį tik jei šis parametras yra pažymėtas."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Susuktoji laidų pora (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "AUI sąsaja"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "MII sąsaja"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Pusinis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Pilnas"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Nepaisyti"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Rankinis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Prievadas"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "Į_renginys"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "_Klonuotas MAC adresas"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Atsibusti esant LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Numatytasis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "Nepa_isyti"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Atsibusti su LAN slaptažodžiu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Atsibusti su LAN slaptažodžiu (laidiniu MAC). Galimas tik magiškiems "
 "paketams."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Saito dery_bos"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1859,11 +1924,11 @@ msgstr ""
 "ir „Dvipusis“ bus taikomos priverstinai, netikrinant įrenginio suderinamumo. "
 "Jei nesate tikri, palikite čia „Nepaisyti“ arba pasirinkite „Automatinis“."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Sparta"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1873,11 +1938,11 @@ msgstr ""
 "nėra pasirinkti parametrai „Nepaisyti“ ir „Automatinis“. Prieš nurodydami "
 "spartos reikšmė, įsitikinkite, kad jūsų įrenginys ją palaiko."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Dvi_pusis"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1887,31 +1952,31 @@ msgstr ""
 "nėra pasirinkti parametrai „Nepaisyti“ ir „Automatinis“. Prieš nurodydami "
 "dvipusę veikseną, įsitikinkite, kad jūsų įrenginys ją palaiko."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Ne"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Visi na_udotojai gali prisijungti prie šio tinklo."
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Automatiškai prisijungti prie _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "Ugniasienės _zona"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "_Matuojamas ryšys"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1923,11 +1988,11 @@ msgstr ""
 "nurodyti programoms, arba „Automatic“ numatytosioms vertėms pagal ryšio tipą "
 "ir euristikas."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "_Prisijungti automatiškai su prioritetu"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1937,7 +2002,7 @@ msgstr ""
 "yra teikiama pirmenybė, kuomet pasirenkami profiliai automatiniam "
 "aktyvavimui. Numatytoji reikšmė yra 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1946,7 +2011,7 @@ msgstr ""
 "adresą, kuris bus konfigūruojamas papildomai su automatiniais adresais, "
 "spustelėkite mygtuką „Pridėti“."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1958,126 +2023,125 @@ msgstr ""
 "spustelėkite mygtuką „Pridėti“. Jeigu nebus pateiktas joks adresas, tuomet "
 "rėžis bus nustatytas automatiškai."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Papildomi statiniai adresai"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresai"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adresas (nebūtinas)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Duomenų paketas"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "_Transporto veiksena"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Įrenginio pavadinimas"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Tėvinis įrenginys"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Veiksena"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Vietinis IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Nuotolinis IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Įvesties raktas"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Išvesties raktas"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatinis su rankiniai DNS nustatymais"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Tik vietinis (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:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Bendrinamas kitiems kompiuteriams"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Metodas"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2087,8 +2151,8 @@ msgstr ""
 "kompiuterio konfigūraciją. Jeigu norite naudoti DHCP kliento "
 "identifikatorių, įveskite jį čia."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2096,25 +2160,23 @@ msgstr ""
 "Sritys, naudojamos ieškant serverių vardų. Galite nurodyti keletą sričių "
 "atskirdami jas kableliais."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "D_HCP kliento ID"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "_Paieškos sritys"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "_DNS serveriai"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2122,11 +2184,11 @@ msgstr ""
 "Sričių vardų serverių, naudojamų serverių vardų paieškai, IP adresai. Sričių "
 "vardų serverių adresus galite atskirti kableliais."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Šiam ryšiui užmegzti yra būtinas IPv_4 adresavimas"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2134,34 +2196,34 @@ msgstr ""
 "Jungiantis prie IPv6 palaikančių tinklų, leidžia užmegzti ryšį, jei IPv4 "
 "konfigūracija nesėkminga, bet IPv6 konfigūracija sėkminga."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Maršrutai…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Išjungtas"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Įjungta (pageidaujamas viešas adresas)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Įjungta (pageidaujamas laikinas adresas)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Stabilus privatumas"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2171,19 +2233,19 @@ msgstr ""
 "vardų daugiau nei vienas, skirkite kableliais. Saitams vietiniai adresai bus "
 "automatiškai apriboti ryšio sąsaja."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 _privatumo plėtiniai"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "IPv6 adresų generavimo veiksena"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Šiam ryšiui užmegzti yra būtinas IPv_6 adresavimas"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2191,28 +2253,28 @@ msgstr ""
 "Jungiantis prie IPv4 palaikančių tinklų, leidžia užmegzti ryšį, jei IPv6 "
 "konfigūracija pavyksta, bet IPv4 konfigūracija sėkminga."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Tikrinti"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Griežtas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "MACsec įrenginio pavadinimas."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2220,7 +2282,7 @@ msgstr ""
 "Tėvinės sąsajos pavadinimas ar tėvinio ryšio UUID, iš kurių turėtų būti "
 "sukurta ši MACSEC sąsaja."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2228,15 +2290,15 @@ msgstr ""
 "Tėvinės sąsajos pavadinimas ar tėvinio ryšio UUID, iš kurių turėtų būti "
 "sukurta ši MACsec sąsaja"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Iš anksto bendrinamo „Connectivity-association Key“ rakto pavadinimas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Iš anksto bendrinamas „Connectivity Association Key“ raktas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2246,202 +2308,202 @@ msgstr ""
 "(MACsec Key Agreement). EAP veiksenai, užpildykite parametrus, esančius "
 "802.1X saugumo puslapyje"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Raktai"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parametrai"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Tikrinimas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI prievadas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Nustato gaunamųjų kadrų tikrinimo veikseną"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Šifruoti"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Ar persiunčiamas srautas turi būti šifruojamas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "SCI (Secure Channel Identifier) prievado komponentas"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Pagrindiniai"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Nu_meris"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Sudėtingesni"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "_Tinklo ID"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Pakeisti…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Naudoti _tarptinklinį ryšį, jei neprieinamas namų tinklas"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:441
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "R_odyti slaptažodžius"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Tapatybės nustatymas"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Leistini metodai"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfigūruoti _metodus…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Glaudinimas"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Naudoti tiesioginį šifravimą (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Reikalauti 128 bitų šifravimo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Naudoti į_simenamąjį MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Leisti _BSD duomenų glaudinimą"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Leisti „_Deflate“ duomenų glaudinimą"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Naudoti TCP _antraščių glaudinimą"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Aidas"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Siųsti PPP _aido paketus"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Tik naršyklei"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Naudoti šią įgaliotojo serverio konfigūraciją tik naršyklių klientams/"
 "schemoms."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "PAC scenarijus"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL iš kurio bus gautas PAC scenarijus."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importuoti scenarijų iš failo…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Metodas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Išplėsti_niai…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Nustatyta pagrindinio"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Laidiniai prievado būsena"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Komandos sudėtingesni nustatymai"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "_Eilės ID"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2449,20 +2511,20 @@ msgstr ""
 "Pliūpsnių skaičius siunčiamiems NA pastangų ir papildomiems ARP paketams po "
 "prievado įjungimo ar išjungimo."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "Eilės ID, su kuria šis prievadas turi būti susietas."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Aktyvios atsarginės kopijos vykdytojo parametrai"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Prievado prioritetas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2470,32 +2532,32 @@ msgstr ""
 "Teigiamas skaičius milisekundėmis. Nurodo intervalą tarp pranešimo "
 "porininkams paketų pliūpsnių."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Prievado prioritetas. Didesnis skaičius reiškia didesnį prioritetą."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "_Nuolatinis prievadas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr "Neatžymėti prievado, jei geresnis tampa prieinamas."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP vykdytojo parametrai"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "_LACP prioritetas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "LACP prievado _raktas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2503,7 +2565,7 @@ msgstr ""
 "Pliūpsnių skaičius prisijungimo prie masinio siuntimo grupės užklausoms po "
 "prievado įjungimo ar išjungimo."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2511,8 +2573,8 @@ msgstr ""
 "Prievado prioritetas pagal LACP standartą. Mažesnis skaičius reiškia didesnį "
 "prioritetą."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2520,7 +2582,7 @@ msgstr ""
 "Teigiamas milisekundžių skaičius. Nurodo intervalą tarp pliūpsnių "
 "prisijungimo masinio siuntimo grupės užklausoms."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2528,48 +2590,48 @@ msgstr ""
 "Prievado raktas pagal LACP standartą. Galima sujungti tik prievadus su tuo "
 "pačiu raktu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "_Saitų stebėtojas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Į_jungimo delsa"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Išjungimo _delsa"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "Siuntimo _intervalas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Delsa _prieš pirmą siuntimą"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Didžiausias praleistų atsakymų skaičius"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Šaltinio serveris"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "Paskir_ties serveris"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2577,8 +2639,8 @@ msgstr ""
 "Daugiausia praleistų atsakymų. Jei šis skaičius viršijamas, saitas laikomas "
 "išjungtu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2586,8 +2648,8 @@ msgstr ""
 "Serverio pavadinimas, konvertuojamas į IP adresą, kuris bus įvestas į ARP "
 "užklausą kaip šaltinio adresas."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2595,13 +2657,13 @@ msgstr ""
 "Serverio pavadinimas, konvertuojamas į IP adresą, kuris bus įvestas į "
 "užklausą kaip paskirties adresas."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Nepaisyti sugadintų paketų iš _aktyvių prievadų"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2609,13 +2671,13 @@ msgstr ""
 "Patikrinti gautus ARP paketus aktyviems prievadams. Jei nepažymėta, visi "
 "gaunami ARP paketai bus laikomi gerais."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Nepaisyti sugadintų paketų iš _neaktyvių prievadų"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2623,13 +2685,13 @@ msgstr ""
 "Patikrinti gaunamus ARP paketus neaktyviuose prievaduose. Jei nepažymėta, "
 "visi gaunami ARP paketai bus laikomi gerais atsakymais."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "Siųsti n_eaktyviuose prievaduose"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2637,157 +2699,156 @@ msgstr ""
 "Numatytai ARP užklausos siunčiamos tik aktyviuose prievaduose. Šis "
 "parametras leidžia siųsti ir neaktyviuose prievaduose."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr "Delsa tarp saito įjungimo ir pranešimo apie tai vykdytojui."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "Delsa tarp saito išjungimo ir pranešimo apie tai vykdytojui."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Intervalas tarp užklausų siuntimo."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "Delsa tarp saito stebėjimo inicijavimo ir pirmos užklausos siuntimo."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Naudotinas saitų stebėtojas."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Saitų stebėtojas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_portuoti komandinio ryšio konfigūraciją iš failo…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Redaguoti _JSON konfigūraciją"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Tiesioginė konfigūracija"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Aukščiausias prioritetas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Aukščiausias prioritetas (stabilus)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Sparta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Didžiausias prievadų skaičius"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Prievado prioritetas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Iš komandos įrenginio"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Iš aktyvaus prievado"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Iš aktyvaus į komandos įrenginį"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "_Komandiniai ryšiai"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Apkrovos balansavimas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Laidinis tinklas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Bet kuris L3 protokolas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Bet kuris L4 protokolas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Pranešimų _porininkui skaičius"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Pra_nešimų porininkui intervalas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "Prisijungimų prie _masinio siuntimo skaičius"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "Paka_rtotinių prisijungimų prie masinio siuntimo skaičius"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Aparatinis adresas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2795,19 +2856,19 @@ msgstr ""
 "Pageidautinas aparatinis adresas naujam komandos įrenginiui. Priimamas "
 "įprastinis MAC adresas."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "_Vykdytojas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "_Aparatinis adreso politika"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Naudotinas vykdytojo pavadinimas."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2815,11 +2876,11 @@ msgstr ""
 "Tai apibrėžia politiką, kaip komandinių įrenginių ir prievadų įrenginių "
 "aparatinės įrangos adresai turėtų būti nustatomi komandos egzistavimo metu."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "_Periodiškai siųsti LACPDU kadrus"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2827,11 +2888,11 @@ msgstr ""
 "Jei pažymėta, LACPDU kadrai yra periodiškai siunčiami per sukonfigūruotus "
 "saitus. Jei ne, tuomet tai veikia principu „atsiliepti, kai kreipiamasi“."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Siųsti LACPDU kadrą _kiekvieną sekundę"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2841,23 +2902,23 @@ msgstr ""
 "paketus. Jei pažymėta, paketai bus siunčiami kartą per sekundę. Priešingu "
 "atveju jie bus siunčiami kas 30 sekundžių."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Sistemos prioritetas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "_Mažiausiai prievadų"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Su_jungėjo pasirinkimo politika"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Sistemos prioritetas, vertė gali būti 0-65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2865,11 +2926,11 @@ msgstr ""
 "Nurodo mažiausią prievadų skaičių, kuris turi būti aktyvus prie pranešant "
 "perdavimą pagrindinei sąsajai, vertė gali būti 1-255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Tai nurodo politiką, kaip bus pasirenkami sujungėjai."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2877,185 +2938,181 @@ msgstr ""
 "Fragmentuotų tipų (eilučių) sąrašas, kuris turi būti naudojamas paketo Tx "
 "maišos skaičiavimui."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Laukai perdavimo maišai"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "Dešimtosiomis sekundės dalimis. Periodinis intervalas tarp perbalansavimo."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Atyvaus Tx balansatoriaus pavadinimas. Aktyvus Tx balansavimas numatytai yra "
 "išjungtas."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Perdavimo _balansavimo intervalas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "_Perdavimo balansuotojas"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Vykdytojas"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Tėvinė sąsaja"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "VLAN sąsajos pa_vadinimas"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Klonuotas MAC _adresas"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN _id"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Požymiai"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "Pe_rrikiuoti antraštes"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "Si_lpnas susiejimas"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Įrenginio pavadinimas + numeris"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + numeris"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Sau_ga"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klientas"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Prieigos taškas"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Persiuntimo _pajėgumai"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Greitis"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Kanalas"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "S_ritis"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nėra polkit leidimo vykdyti veiksmą"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Leistini tapatybės nustatymo metodai"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol (2 versija)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3064,215 +3121,209 @@ msgstr ""
 "metodus. Jei nepavyksta prisijungti, pabandykite išjungti kai kurių metodų "
 "palaikymą."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Belaidis"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Komanda"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Tinklų tiltas"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP tunelis"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Nėra VPN tarnybos tipo."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "VPN įskiepiui nepavyko tinkamai importuoti VPN ryšio:"
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Pasirinkite importuotiną failą"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Atverti"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Aparatinė įranga"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtualus"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importuoti įrašytą VPN konfigūraciją…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Nepavyko inicijuoti ryšių redaktoriaus dialogo dėl nežinomos klaidos."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Nepavyko sukurti naujo ryšio"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Nepavyko ištrinti ryšio"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ar tikrai norite ištrinti ryšį %s?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Naujas ryšys"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresas"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Tinklo kaukė"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Tinklų sietuvas"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiksas"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Taisomas %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Taisomas nepavadintas ryšys"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Trūksta ryšio pavadinimo"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Inicijuojamas redaktorius…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Nepavyko pakeisti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Netinkamas nustatymas %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "Ryšių redaktorius nerado kai kurių reikalingų išteklių (nerastas .ui failas)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Išsaugoti visus šiam ryšiui daromus pakeitimus."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Nustatykite tapatybę, jei pageidaujate išsaugoti šį ryšį visiems šio "
 "kompiuterio naudotojams."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Nepavyko sukurti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Nepavyko taisyti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nežinoma klaida kuriant ryšio redaktoriaus dialogą."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3280,19 +3331,19 @@ msgstr ""
 "Įspėjimas: ryšyje yra kai kurios redaktoriaus nepalaikomos savybės. Įrašius, "
 "jos bus išvalytos."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Klaida inicijuojant redaktorių"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Nepavyko pridėti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Ištaisyti"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3300,23 +3351,23 @@ msgstr ""
 "Saugumo įrašai gali sutrukdyti panaudoti kai kuriuos failus tapatybės "
 "nustatymui naudojant liudijimą."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Ryšio pa_vadinimas"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Eksportuoti…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Peržymėti failus"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Peržymėti"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3324,25 +3375,25 @@ msgstr ""
 "Šie failai nėra pažymėti tapatybės patvirtinimui su liudijimu. Ar norite "
 "pataisyti žymėjimus?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Peržymėti"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "niekada"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "dabar"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3350,7 +3401,7 @@ msgstr[0] "prieš %d minutę"
 msgstr[1] "prieš %d minutes"
 msgstr[2] "prieš %d minučių"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3358,7 +3409,7 @@ msgstr[0] "prieš %d valandą"
 msgstr[1] "prieš %d valandas"
 msgstr[2] "prieš %d valandų"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3366,7 +3417,7 @@ msgstr[0] "prieš %d dieną"
 msgstr[1] "prieš %d dienas"
 msgstr[2] "prieš %d dienų"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3374,7 +3425,7 @@ msgstr[0] "prieš %d mėnesį"
 msgstr[1] "prieš %d mėnesius"
 msgstr[2] "prieš %d mėnesių"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3382,157 +3433,156 @@ msgstr[0] "prieš %d metus"
 msgstr[1] "prieš %d metus"
 msgstr[2] "prieš %d metų"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Ryšys negali būti ištrintas"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Pasirinkite ryšį, kurį taisyti"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Pasirinkite ryšį, kurį ištrinti"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Paskutinį kartą naudotas"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Taisyti pasirinktą ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Norint taisyti pasirinktą ryšį, reikia nustatyti tapatybę"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Pašalinti pasirinktą ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Norint pašalinti pasirinktą ryšį, reikia nustatyti tapatybę"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Neatpažintas ryšio tipas"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Nežinoma, kaip importuoti „%s“ ryšius"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Klaida importuojant ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Klaida kuriant ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Nenurodytas ryšio tipas"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Nėra įdiegtų VPN įskiepių."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Nežinoma, kaip sukurti „%s“ ryšius"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Klaida taisant ryšio nustatymus"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Nepavyko rasti ryšio, kurio UUID „%s“"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "Tinklo ryšiai"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Pridėti naują ryšį"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X sauga"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Nepavyko įkelti 802.1X saugos naudotojo sąsajos."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Naudoti 802.1_X saugą šiam ryšiui"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Bluetooth įrenginio MAC adresas. Pavyzdžiui, 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Nepavyko įkelti Bluetooth naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neteisingas Bluetooth įrenginys (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth ryšys %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth tipas"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Pasirinkite Bluetooth ryšio profilio tipą"
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Asmeninės erdvės tinklas"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "_Telefoninis tinklas"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Nepavyko įkelti bond naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "pirminis"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond ryšys %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Nepavyko įkelti tinklų tilto naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Tinklų tilto ryšys %d"
@@ -3540,36 +3590,36 @@ msgstr "Tinklų tilto ryšys %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Tinklų tilto prievadas"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Nepavyko įkelti tinklų tilto prievado naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Nepavyko įkelti DSB naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Nepavyko įkelti DSL naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "trūksta tėvinės sąsajos"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ryšys %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3579,41 +3629,40 @@ msgstr ""
 "pavadinimas arba nuolatinis MAC adresas, arba abudu. Pavyzdžiai: „em1“, "
 "„3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "nepaisoma"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Nepavyko įkelti laidinio ryšio naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Laidinis tinklas"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klonuotas MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Atsibusti su LAN slaptažodžiu"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Laidinis ryšys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Numatytasis"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3623,11 +3672,11 @@ msgstr ""
 "pasirinkus ugniasienėje naudojama numatytoji zona. Panaudojama tik jei "
 "firewalld yra aktyvi."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Nepavyko įkelti pagrindinės naudotojo sąsajos."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3639,166 +3688,158 @@ 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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Nepavyko įkelti InfiniBand naudotojo sąsajos."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband įrenginys"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand ryšys %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Nepavyko įkelti IP tunelio naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP tunelio ryšys %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatinis (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatinis (VPN) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatinis, tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatinis (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatinis (PPPoE) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatinis (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatinis (DHCP) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Tik vietinis (link-local)"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Papildomi _DNS serveriai"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Papildomos pai_eškos sritys"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Taisomi IPv4 maršrutai „%s“"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 nustatymai"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Nepavyko įkelti IPv4 naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 adresas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 adreso tinklo kaukė „%s“ yra netinkama"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 tinklų sietuvas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS serveris „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatinis, tik DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Taisomi IPv6 maršrutai „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 nustatymai"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Nepavyko įkelti IPv6 naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 adresas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 priešdėlis „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 tinklų sietuvas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS serveris „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Nepavyko įkelti MACsec naudotojo sąsajos."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC ryšys %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Dubliuoti pavaldieji"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Pavaldieji „%s“ ir „%s“ abu yra taikomi įrenginiui „%s“"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3807,25 +3848,25 @@ msgstr ""
 "Pavaldieji „%s“ ir „%s“ yra taikomi skirtingiems virtualiems prievadams "
 "(„%s“ ir „%s“) tame pačiame fiziniame įrenginyje."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s pavaldusis %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Nepavyko įkelti mobiliojo plačiajuosčio ryšio naudotojo sąsajos."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nepalaikomas mobiliojo plačiajuosčio ryšio tipas."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pasirinkite mobiliojo plačiajuosčio ryšio tiekėjo tipą"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3833,7 +3874,7 @@ msgstr ""
 "Pasirinkite technologiją, kurią naudoja jūsų mobiliojo plačiajuosčio ryšio "
 "tiekėjas. Jei nesate tikri, klauskite savo tiekėjo."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mano tiekėjas naudoja _GSM paremtą technologiją (t. y. GPRS, EDGE, UMTS, "
@@ -3841,80 +3882,78 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mano tiekėjas naudoja C_DMA paremtą technologiją (t. y. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "joks"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Taisomi „%s“ PPP tapatybės nustatymo metodai"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP nustatymai"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Nepavyko įkelti PPP naudotojo sąsajos."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Įgaliotasis serveris"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Nepavyko įkelti įgaliotojo serverio naudotojo sąsajos."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Klaida: faile nėra tinkamos JSON konfigūracijos"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Nepavyko įkelti team naudotojo sąsajos."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Komandinis ryšys %d"
@@ -3922,68 +3961,67 @@ msgstr "Komandinis ryšys %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Team prievadas"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Nepavyko įkelti team prievado naudotojo sąsajos."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (per „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Naujas ryšys…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Nepavyko įkelti vlan naudotojo sąsajos."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan tėvas"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ryšys %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Nepavyko įkelti „%s“ VPN redaktoriaus įskiepio (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "nežinoma klaida"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Nepavyko įkelti VPN naudotojo sąsajos."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Nepavyko rasti „%s“ VPN įskiepio."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ryšys %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Pasirinkite VPN ryšio tipą"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3992,7 +4030,7 @@ msgstr ""
 "Pasirinkite VPN tipą, kurį pageidaujate naudoti naujajam ryšiui. Jei norimo "
 "tipo sąraše nėra, gali būti neįdiegtas reikiamas VPN įskiepis."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4000,7 +4038,7 @@ msgstr ""
 "Šis parametras pririša šį ryšį prie belaidžio prieigos taško (AP), nurodyto "
 "čia įvestu BSSID. Pavyzdys: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4010,93 +4048,91 @@ msgstr ""
 "pavadinimas, nuolatinis MAC adresas arba abudu. Pavyzdžiai: „wlan0“, "
 "„3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nepavyko įkelti Wi-Fi naudotojo sąsajos."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi įrenginys"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Belaidis ryšys %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:942 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitų raktas (šešioliktainis arba ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitų slaptafrazė"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinaminis WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:995 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ir WPA2 asmeninis"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1013 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ir WPA2 industrinis"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Nepavyko įkelti Wi-Fi saugos naudotojo sąsajos. Nėra Wi-Fi nustatymo."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Belaidžio ryšio sauga"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nepavyko įkelti Wi-Fi saugos naudotojo sąsajos."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "trūksta SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Saugumas nesuderinamas su Ad-Hoc veiksena"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Failas pavadinimu „%s“ jau yra."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ar norite pakeisti %s VPN ryšiu, kurį bandote įrašyti?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nepavyko eksportuoti VPN ryšio"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4107,116 +4143,103 @@ msgstr ""
 "\n"
 "Klaida: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Eksportuoti VPN ryšį…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Atrakinti"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automatiškai atrakinti šį įrenginį"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Ryšio informacija"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Suaktyvinti tinklo ryšiai"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Nenustatytas joks liudijimas"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Nenustatytas joks raktas"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pasirinkite raktą, skirtą %s liudijimui"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "%s privatusis ra_ktas"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "%s rakto sla_ptažodis"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Pasirinkite %s liudijimą"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "%s _liudijimas"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mano šalies nėra sąraše"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nėra sąraše"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mano plano sąraše nėra…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tiekėjas"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Šalis ar regionas"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Įdiegtas GSM įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Įdiegtas CDMA įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Bet koks įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Naujas mobilusis plačiajuostis ryšys"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4224,84 +4247,70 @@ msgstr ""
 "Šis pagelbiklis leidžia lengvai nustatyti mobilųjį plačiajuostį ryšį su "
 "mobiliuoju (3G) tinklu."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Jums prireiks šios informacijos:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Jūsų plačiojuosčio ryšio tiekėjo pavadinimas"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Jūsų plačiajuosčio ryšio mokėjimo plano vardas"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(kai kuriais atvejais) Jūsų plačiajuosčio ryšio mokėjimo plano APN (prieigos "
 "taško vardas)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Sukurti ryšį _šiam mobiliojo plačiajuosčio ryšio įrenginiui:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Nustatyti mobilųjį plačiajuostį ryšį"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Šalių ar regionų sąrašas:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Šalis ar regionas"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Pasirinkite savo tiekėjo šalį ar regioną"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Pasirinkite savo tiekėją iš _sąrašo:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Mano tiekėjas naudoja GSM technologiją (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mano tiekėjas naudoja CDMA technologiją (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pasirinkite savo tiekėją"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Pasirinkite savo planą:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Pasirinktas plano _APN (prieigos taško vardas):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4314,38 +4323,32 @@ msgstr ""
 "Jeigu nesate tikri dėl savo plano, paklauskite savo tiekėjo, koks yra jūsų "
 "plano APN (prieigos taško vardas)."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Pasirinkite savo mokėjimo planą"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Jūsų mobilusis plačiajuostis ryšys nustatytas, naudojant šiuos nustatymus:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Jūsų įrenginys:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Jūsų tiekėjas:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jūsų planas:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4359,141 +4362,140 @@ msgstr ""
 "Norėdami pakeisti savo mobiliojo plačiajuosčio ryšio nustatymus, pasirinkite "
 "meniu Sistema → Nuostatos punktą „Tinklo ryšiai“."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Patvirtinkite mobiliojo plačiajuosčio ryšio nustatymus"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Nėra)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Raktas, esantis %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Liudijimas, esantis %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Nežinoma)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Pasirinkti"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Pasirinkti iš failo…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Pasirinkite %s liudijimą"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "%s liudijimo sla_ptažodis"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Klaida jungiantis į: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Klaida atveriant seansą: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Atrakinti leksemą"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Išdavė"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Įveskite %s PIN"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Prisijungti"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "P_risiminti PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Įrašyti slaptažodį tik šiam naudotojui"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Įrašyti slaptažodį visiems naudotojams"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Klausti šio slaptažodžio kiekvieną kartą"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Slaptažodis nereikalingas"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "R_odyti slaptažodžius"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Tretinis slaptažodis:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Antrinis slaptažodis:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: ../src/libnma/nma-wifi-dialog.c:126 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Spustelėkite, norėdami prisijungti"
 
-#: ../src/libnma/nma-wifi-dialog.c:457 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Naujas…"
 
-#: ../src/libnma/nma-wifi-dialog.c:925 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/libnma/nma-wifi-dialog.c:981 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinaminis WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1101 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Suku_rti"
 
-#: ../src/libnma/nma-wifi-dialog.c:1179 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4501,35 +4503,35 @@ msgstr ""
 "Norint gauti prieigą prie belaidžio tinklo „%s“ reikalingi slaptažodžiai ar "
 "šifravimo raktai."
 
-#: ../src/libnma/nma-wifi-dialog.c:1181 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Reikia nustatyti jūsų tapatybę belaidžiame tinkle"
 
-#: ../src/libnma/nma-wifi-dialog.c:1183 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Belaidis tinklas prašo nustatyti jūsų tapatybę"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Sukurti naują belaidį tinklą"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Naujas belaidis tinklas"
 
-#: ../src/libnma/nma-wifi-dialog.c:1191 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Įveskite pageidaujamo sukurti belaidžio tinklo pavadinimą."
 
-#: ../src/libnma/nma-wifi-dialog.c:1193 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Prisijungti prie paslėpto belaidžio tinklo"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Paslėptas belaidis tinklas"
 
-#: ../src/libnma/nma-wifi-dialog.c:1196 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4537,43 +4539,51 @@ msgstr ""
 "Įveskite paslėpto belaidžio tinklo, prie kurio norite jungtis, pavadinimą ir "
 "saugos informaciją."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Belaidžio ryšio _sauga"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "_Ryšys"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "Belaidis _adapteris"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Tiekėjas:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Šalių ar regionų sąrašas:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Šalis ar regionas"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Laidinis"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC junglusis tinklas"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4583,13 +4593,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4597,27 +4607,27 @@ msgstr ""
 "Trūksta slaptažodžio arba ryšys yra netinkamas. Pastaruoju atveju reikia "
 "pirma paredaguoti ryšį naudojant nm-connection-editor"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Belaidžio ryšio _sauga:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Tinklo pavadinimas:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "_Ryšys:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Belaidis _adapteris:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Naudojimas:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4625,351 +4635,347 @@ msgstr ""
 "Ši programa yra NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) dalis."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "Ji neskirta būti naudojama komandų eilutėje, ji veikia GNOME darbalaukyje."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "neįjungta"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistruotas"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Namų tinklas (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Namų tinklas"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ieškoma"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija atmesta"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s tarptinklinis ryšys)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (tarptinklinis ryšys)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Tarptinklinio ryšio tinklas (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Tarptinklinio ryšio tinklas"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN kodas SIM kortelei „%s“ įrenginyje „%s“"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Reikalingas PIN kodas"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiliojo plačiajuosčio ryšio įrenginiui reikia PIN kodo"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobilusis plačiajuostis ryšys „%s“ aktyvus: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "tarptinklinis ryšys"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s ryšys"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM liudijimai (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM ar PKCS#12 privatieji raktai (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "neapibrėžta 802.1X saugumo klaida (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "nepasirinktas joks LĮ liudijimas"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "pasirinkto LĮ liudijimo failo nėra"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "trūksta EAP-FAST PAC failo"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Pasirinkite PAC failą"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC failai (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Visi failai"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anoniminis"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Tapatybė nustatyta"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Abu"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Anoni_minė tapatybė"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "PAC _failas"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "_Vidinis tapatybės nustatymas"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leisti automatinį PAC _teikimą"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "trūksta EAP-LEAP naudotojo vardo"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "trūksta EAP-LEAP slaptažodžio"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "0-ė versija"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "1-oji versija"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "LĮ liudijimas ne_būtinas"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "PEAP _versija"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Serverio liudijimo pavadinimo priesaga."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Sritis"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "trūksta EAP naudotojo vardo"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "trūksta EAP slaptažodžio"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr "trūksta EAP kliento privataus rakto slaptafrazės"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
-#| msgid "WEP 128-bit Passphrase"
+#: src/wireless-security/eap-method-simple.ui:103
 msgid "P_rivate Key Passphrase"
 msgstr "P_rivataus rakto slaptafrazė"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
-#| msgid "Sh_ow passwords"
+#: src/wireless-security/eap-method-simple.ui:128
 msgid "Sh_ow passphrase"
 msgstr "R_odyti slaptafrazę"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "trūksta EAP-TLS identiteto"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "nepasirinktas naudotojo liudijimas"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "pasirinkto naudotojo liudijimo failo nėra"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "nepasirinktas raktas"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "pasirinkto rakto failo nėra"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "_Tapatybė"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (be EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Nežinoma klaida tikrinant 802.1X saugumą"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tuneliuojamas TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Apsaugotas EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr "Sukonfigūruota išorėje"
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "_Tapatybės nustatymas"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "trūksta leap-username"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "trūksta leap-password"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "trūksta wep-key"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "netinkamas wep-key: %zu ilgio raktas turi turėti tik šešioliktainius "
 "skaitmenis"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "netinkamas wep-key: %zu ilgio raktas turi turėti tik ascii simbolius"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4978,39 +4984,39 @@ msgstr ""
 "netinkamas wep-key: blogas %zu ilgio raktas. Raktas turi būti 5/13 (ascii) "
 "arba 10/26 (šešioliktainis) ilgio"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "netinkamas wep-key: slaptafrazė negali būti tuščia"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "netinkamas wep-key: slaptafrazė turi būti trumpesnė nei 64 simboliai"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Atviroji sistema"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Bendrasis raktas"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (numatytasis)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Raktas"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "R_odyti raktą"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP inde_ksas"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5019,16 +5025,25 @@ msgstr ""
 "netinkamas wpa-psk: netinamas rakto ilgis %zu. Turi būti [8.63] baitai arba "
 "64 šešioliktainiai skaitmenys"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "netinkamas wpa-psk: negalima interpretuoti 64 baitų kaip šešioliktainio "
 "skaičiaus"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Tipas"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (numatytasis)"
+
+#~ msgid "Ignored"
+#~ msgstr "Nepaisoma"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Suaktyvinti tinklo ryšiai"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "Nepavyko atnaujinti ryšio paslapčių dėl nežinomos klaidos."
 
diff --git a/po/lv.po b/po/lv.po
index 61d4debf..5c9ca13f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD2\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Network"
-"Manager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2018-03-19 00:48+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-03-23 22:08+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
@@ -20,53 +20,60 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
-" 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Tīkls"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Pārvaldiet savus tīkla savienojumus"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Tīkla savienojumi"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Neapstrādāta konfigurācija"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Pārvaldiet un mainiet tīkla savienojumu iestatījumus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Izslēgt paziņojumus par savienošanos"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
-"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas ar "
-"tīklu."
+"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas ar tīklu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Izslēgt paziņojumus par atvienošanos"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad atvienojas no "
-"tīkla."
+"Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad atvienojas no tīkla."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Izslēgt VPN paziņojumus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -74,51 +81,52 @@ msgstr ""
 "Iestatiet to kā “patiess”, lai izslēgtu paziņojumus, kad savienojas vai "
 "atvienojas no VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Noklusēt tīklu pieejamības paziņojumus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"Iestatiet šo kā “patiess”, lai izslēgtu paziņojumus, kad ir pieejams "
-"bezvadu tīkls."
+"Iestatiet šo kā “patiess”, lai izslēgtu paziņojumus, kad ir pieejams bezvadu "
+"tīkls."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Spiedogs"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Izmanto, lai noteiktu, vai iestatījumus vajadzētu pārnest uz jauno versiju."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Izslēgt Wi-Fi izveidošanu"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Iestatiet to kā “patiess”, lai izslēgtu ekspromta tīklu veidošanu, kad "
 "izmanot šo sīklietotni."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Rādīt sīklietotni paziņojumu laukā"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Iestatiet uz APLAMS, lai izslēgtu sīklietotnes rādīšanu paziņojumu laukā."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorēt CA sertifikātu"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -126,7 +134,7 @@ msgstr ""
 "Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
 "EAP autentifikācijā."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -134,145 +142,146 @@ msgstr ""
 "Iestatiet šo kā “patiess”, lai izslēgtu brīdinājumus par CA sertifikātiem "
 "EAP 2. fāzes autentifikācijā."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager savienojumu redaktors"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
-"NetworkManager ir sistēmas pakalpojums tīkla savienojumu un ierīču"
-" pārvaldībai un konfigurēšanai."
+"NetworkManager ir sistēmas pakalpojums tīkla savienojumu un ierīču "
+"pārvaldībai un konfigurēšanai."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
-"nm-connection-editor strādā ar NetworkManager, lai izveidotu un rediģētu"
-" savienojumu profilus NetworkManager programmai."
+"nm-connection-editor strādā ar NetworkManager, lai izveidotu un rediģētu "
+"savienojumu profilus NetworkManager programmai."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager izstrādātāji"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "objektu klasei “%s” nav īpašības ar nosaukumu “%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "objektu klases “%2$s” īpašība “%1$s” nav rakstāma"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
-"objekta “%2$s” konstrukcijas īpašību “%1$s” nevar iestatīt pēc uzkonstruēšanas"
+"objekta “%2$s” konstrukcijas īpašību “%1$s” nevar iestatīt pēc "
+"uzkonstruēšanas"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "“%s::%s” nav derīgs īpašības nosaukums; “%s” nav GObject apakštips"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "nevar iestatīt īpašību “%s” ar tipu “%s” no tipa “%s” vērtības"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr ""
-"tipa “%2$s” vērtība “%1$s” nav derīga vai ir ārpus tipa “%4$s” īpašības “"
-"%3$s” apgabala"
+"tipa “%2$s” vērtība “%1$s” nav derīga vai ir ārpus tipa “%4$s” īpašības "
+"“%3$s” apgabala"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X autentifikācija"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Savien_oties"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Tīkla _nosaukums:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ekspromta"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "drošs."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Neizdevās pievienot/aktivizēt savienojumu"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Savienojums neizdevās"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Neizdevās ierīces atvienošana"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Atvienošanās neizdevās"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Savienojuma ieslēgšana neizdevās"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Vairs nerādīt šo ziņojumu"
 
-#: ../src/applet.c:899
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +291,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” atvienojās, jo tika pārtraukts tīkla savienojums."
 
-#: ../src/applet.c:901
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +301,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo tika pārtraukts tīkla savienojums."
 
-#: ../src/applet.c:903
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +310,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN pakalpojums negaidīti apstājās."
 
-#: ../src/applet.c:905
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -312,7 +321,7 @@ msgstr ""
 "VPN savienojums “%s” neizdevās, jo VPN pakalpojums atgrieza nederīgu "
 "konfigurāciju."
 
-#: ../src/applet.c:907
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +330,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo savienošanās mēģinājumam iestājās noildze."
 
-#: ../src/applet.c:909
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +339,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN pakalpojums laicīgi nepalaidās."
 
-#: ../src/applet.c:911
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +348,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN pakalpojumam neizdevās palaisties."
 
-#: ../src/applet.c:913
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +357,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo nebija derīgu VPN noslēpumu (secrets)."
 
-#: ../src/applet.c:915
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -357,7 +366,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās nederīgu VPN noslēpumu (secrets) dēļ."
 
-#: ../src/applet.c:920
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -366,7 +375,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās."
 
-#: ../src/applet.c:947
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -377,19 +386,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:949
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN savienojums ir veiksmīgi izveidots.\n"
 
-#: ../src/applet.c:951
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN pieteikšanās ziņojums"
 
-#: ../src/applet.c:959 ../src/applet.c:999
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN savienojums neizdevās"
 
-#: ../src/applet.c:1003
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -402,7 +411,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -415,566 +424,578 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ierīce nav gatava (trūkst aparātprogrammatūras)"
 
-#: ../src/applet.c:1297
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ierīce nav gatava"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "atvienots"
 
-#: ../src/applet.c:1323
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Atvienoties"
 
-#: ../src/applet.c:1337
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ierīce nav pārvaldīta"
 
-#: ../src/applet.c:1410
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nav pieejamu tīkla ierīču"
 
-#: ../src/applet.c:1464
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN savienojumi"
 
-#: ../src/applet.c:1508
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Konfigurēt VPN…"
 
-#: ../src/applet.c:1511
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Pievienot VPN s_avienojumu…"
 
-#: ../src/applet.c:1617
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager nav palaists…"
 
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Tīklošana izslēgta"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Ieslēgt tīkloša_nu"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Ieslēgt bez_vadu tīklošanu"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Ieslēgt _mobilo platjoslas tīklu"
 
 #. Toggle notifications item
-#: ../src/applet.c:1862
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Ieslēgt paziņ_ojumus"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1874
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Savienojuma _informācija"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Rediģēt savienojumus…"
 
-#: ../src/applet.c:1896
+#: src/applet.c:1895
 msgid "_About"
 msgstr "P_ar"
 
-#: ../src/applet.c:2207
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Tagad ir savienojums ar “%s”."
 
-#: ../src/applet.c:2247
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Atvienots"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Tīkla savienojums tika atvienots."
 
-#: ../src/applet.c:2550
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Gatavo tīkla savienojumu “%s”…"
 
-#: ../src/applet.c:2553
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Tīkla savienojumam “%s” ir nepieciešama lietotāja autentifikācija…"
 
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Tiek pieprasīta “%s” tīkla adrese…"
 
-#: ../src/applet.c:2559
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet.c:2632
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Startē VPN savienojumu “%s”…"
 
-#: ../src/applet.c:2635
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN savienojumam “%s” ir nepieciešama lietotāja autentifikācija…"
 
-#: ../src/applet.c:2638
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Tiek pieprasīta “%s” VPN adrese…"
 
-#: ../src/applet.c:2641
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN savienojums ir aktīvs"
 
-#: ../src/applet.c:2691
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nav tīkla savienojuma"
 
-#: ../src/applet.c:3292
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager sīklietotne"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Nepareizs PUK kods. Lūdzu, sazinieties ar operatoru."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Nepareizs PIN kods. Lūdzu, sazinieties ar operatoru."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Sūta atbloķēšanas kodu…"
 
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilais platjoslas tīkls (%s)"
 
-#: ../src/applet-device-broadband.c:739
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilā platjosla"
 
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Pieejams"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:805
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Jauns mobilās platjoslas tīkla savienojums…"
 
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Savienojums ir izveidots"
 
-#: ../src/applet-device-broadband.c:820
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ir savienojums ar mobilo platjoslas tīklu."
 
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilās platjoslas tīkls."
 
-#: ../src/applet-device-broadband.c:961
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Jūs tagad esat reģistrēts mājas tīklā."
 
-#: ../src/applet-device-broadband.c:967
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Jūs tagad esat reģistrēts klejošanas tīklā."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Ir savienojums ar mobilo platjoslas tīklu."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Gatavo mobilās platjoslas savienojumu “%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Konfigurē mobilās platjoslas savienojumu “%s”…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Mobilās platjoslas savienojumam “%s” ir nepieciešama lietotāja "
 "autentifikācija…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobilās platjoslas savienojums “%s” ir aktīvs"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automātisks Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Vadu tīkli (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Vadu tīkls (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Vadu tīkli"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Vadu tīkls"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ir savienojums ar vadu tīklu."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Gatavo ethernet tīkla savienojumu “%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Konfigurē ethernet tīkla savienojumu “%s”…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Vadu ethernet savienojumam “%s” ir nepieciešama lietotāja autentifikācija…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Tiek pieprasīta “%s” ethernet tīkla adrese…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikācija"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_Labi"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Savienoties ar slēptu bezvadu tīklu…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Izveidot jau_nu bezvadu tīklu…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(nav)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Neizdevās pievienot jaunu savienojumu"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Nepietiekamas privilēģijas."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bezvadu tīkli (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bezvadu tīkls (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Bezvadu tīkls"
 msgstr[1] "Bezvadu tīkli"
 msgstr[2] "Bezvadu tīklu"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Bezvadu tīkls ir izslēgts"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Bezvadu tīkls ir izslēgts ar slēdzi datorā"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Vairāk tīklu"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Pieejamie bezvadu tīkli"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Izmantojiet tīkla izvēlni, lai savienotos ar bezvadu tīklu"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Ir savienojums ar bezvadu tīklu “%s”.no"
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Gatavo bezvadu tīkla savienojumu “%s”…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigurē bezvadu tīklu savienojumu “%s”…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Bezvadu tīkla savienojumam “%s” ir nepieciešama lietotāja autentifikācija…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Tiek pieprasīta “%s” bezvadu tīkla adrese…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Bezvadu tīkla savienojums “%s” ir aktīvs — %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Bezvadu tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Neizdevās aktivizēt savienojumu"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Kļūda, rādot informāciju par savienojumu:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamiskais WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Vairāk adrešu"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nekāda"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (noklusējuma)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nezināms"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nezināma"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP adrese"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Apraides adrese"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nezināma"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Apakštīkla maska"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Primārais DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Sekundārais DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Tercārais DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Vispārējs"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Saskarne"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Aparatūras adrese"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Draiveris"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Ātrums"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Drošība:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Noklusējuma maršruts"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorēts"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Tīklājs"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Parole:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN tips"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN vārteja"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN lietotājvārds"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN karogs"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Bāzes savienojums"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nezināms"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nav atrastu aktīvu savienojumu!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -984,21 +1005,21 @@ msgstr ""
 "Autortiesības © 2005-2008 Novell, Inc.\n"
 "un daudzi citi kopienas veidotāji un tulkotāji"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Paziņojumu lauka sīklietotne tīkla ierīču un savienojumu pārvaldīšanai."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager tīmekļa vietne"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Rūdolfs Mazurs Raivis Dejus Andris Zāģeris Ivars Strazdiņš"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1006,33 +1027,33 @@ msgstr ""
 "Tīkla NetworkManager sīklietotne nevarēja atrast dažus pieprasītos resursus "
 "(.ui datne netika atrasta)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Trūkstošie resursi"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mobilās platjoslas tīkla parole"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Lai savienotos ar “%s”, ir nepieciešama parole."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Ir nepieciešama SIM PIN atbloķēšana"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Ir nepieciešama SIM PIN atbloķēšana"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1042,25 +1063,25 @@ msgstr ""
 "PIN kods."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kods:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Rādīt PIN kodu"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Ir nepieciešama SIM PUK atbloķēšana"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Ir nepieciešama SIM PUK atbloķēšana"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1070,85 +1091,83 @@ msgstr ""
 "PUK kods."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kods:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Jauns PIN kods:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Atkal ievadiet jauno PIN kodu:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Rādīt PIN/PUK kodus"
 
-#: ../src/applet-vpn-request.c:201
-#| msgid "Connection Information"
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Savienojumam nebija VPN iestatījuma"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Neizdevās rakstīt savienojumu uz VPN UI — %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Neizdevās rakstīt savienojumu uz VPN UI — nepilnīga rakstīšana"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
-"IP adrese identificē jūsu datoru tīklā. Spiediet “Pievienot”, lai pievienotu"
-" IP adresi."
-
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+"IP adrese identificē jūsu datoru tīklā. Spiediet “Pievienot”, lai pievienotu "
+"IP adresi."
+
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Pievienot"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Dzēst"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norēt automātiski saņemtos maršrutus"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Izmant_ot šo savienojumu tikai šī tīkla resursiem"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1156,15 +1175,15 @@ msgstr ""
 "Ja ieslēgts, šis savienojums nekad netiks izmantots kā noklusējuma tīkla "
 "savienojums."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "Iz_veidot…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Izvēlieties savienojumu veidu"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1176,90 +1195,93 @@ msgstr ""
 "Ja veidojat VPN un sarakstā nav pieejams jums vajadzīgais VPN savienojuma "
 "veids, iespējams, ka nav uzinstalēts vajadzīgais VPN spraudnis."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Ierīce"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Apaļkārte"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktīvā dublēšana"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Apraide"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptīvā pārraides slodzes līdzsvarošana"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptīvā slodzes līdzsvarošana"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ieteicams)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "Saistītie _savienojumi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-#| msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "R_ežīms"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-#| msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Novērošanas _biežums"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-#| msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "_Saskarnes nosaukums"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-#| msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "_Saites novērošana"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-#| msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "ARP _mērķi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1267,22 +1289,19 @@ msgstr ""
 "IP adrese, vai ar komatiem atdalīts saraksts ar IP adresēm, kuras meklēt, "
 "kad pārbauda saites statusu."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-#| msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Saites aktivēšanas aizt_ure"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-#| msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Saites _deaktivēšanas aizture"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-#| msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Primārais"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1290,360 +1309,387 @@ msgstr ""
 "Primārās ierīces saskarnes nosaukums. Ja ir iestatīts, šī ierīce vienmēr būs "
 "aktīvais sekotājs, kad tā ir pieejama."
 
-#: ../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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "baiti"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-#| msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "_Ceļa izmaksas"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#| msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Prioritāte"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#| msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "_Matadatas režīms"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Ar _tiltu saistītie savienojumi"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-#| msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "_Pārsūtīšanas aizture"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-#| msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "_Sveiciena laiks"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP pārsūtīšanas aizture sekundēs"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP sveiciena laiks sekundēs"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Ieslēgt I_GMP novērošanu"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
-"Nosaka, vai šim tiltam ir ieslēgta IGMP novērošana. Ņemiet vērā, ka, ja"
-" novērošana tika automātiski izslēgta dēļ jaucējvērtību kolīzijas, sistēma"
-" var atteikties ieslēgt šo vērtību līdz kolīzijas tiek atrisinātas."
+"Nosaka, vai šim tiltam ir ieslēgta IGMP novērošana. Ņemiet vērā, ka, ja "
+"novērošana tika automātiski izslēgta dēļ jaucējvērtību kolīzijas, sistēma "
+"var atteikties ieslēgt šo vērtību līdz kolīzijas tiek atrisinātas."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Ieslēgt _STP (savienotā koka protokols)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr "Nosaka, vai šim tiltam ir ieslēgts Spanning Tree Protocol (STP)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr ""
-"STP prioritāte šim tiltam. Zemākas vērtības ir “labākas” — zemākās"
-" prioritātes tilts tiks ievēlēts par saknes tiltu."
+"STP prioritāte šim tiltam. Zemākas vērtības ir “labākas” — zemākās "
+"prioritātes tilts tiks ievēlēts par saknes tiltu."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
-#| msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Maksimālais vecums"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "STP maksimālais vecums sekundēs"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
-#| msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "Novecoš_anas laiks"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Ethernet MAC adreses novecošanas laiks sekundēs"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Grupas _pāradresēšanas maska"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
 "can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
 "frames and LACP."
 msgstr ""
-"16 bitu maska, katra attiecas uz grupas adresi apgabalā no "
-"01:80:C2:00:00:00 līdz 01:80:C2:00:00:0F, kas ir jāpārsūta. Maskā nevar būt"
-" iestatīti biti 0, 1 un 2, jo tos izmanto STP, MAC pauzes kadri un LACP."
+"16 bitu maska, katra attiecas uz grupas adresi apgabalā no 01:80:C2:00:00:00 "
+"līdz 01:80:C2:00:00:0F, kas ir jāpārsūta. Maskā nevar būt iestatīti biti 0, "
+"1 un 2, jo tos izmanto STP, MAC pauzes kadri un LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automātiski"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "noklusējuma"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "nespecifiska kļūda"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Saglabāt"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Pastāvīgs"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Nejaušs"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabils"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 "Šeit ievadītās MAC adreses tiks izmantotas kā aparatūras adreses tīkla "
-"ierīcei, uz kuras ir aktivizēts šis savienojums. Šī iespēja ir pazīstama kā"
-" MAC klonēšana jeb viltošana. Piemērs: 00:11:22:33:44:55"
+"ierīcei, uz kuras ir aktivizēts šis savienojums. Šī iespēja ir pazīstama kā "
+"MAC klonēšana jeb viltošana. Piemērs: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC adrese"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Aparatūras adrese"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "nederīgs %s prieks %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "nederīgs %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "nederīgs saskarnes nosaukums priekš %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nederīgs saskarnes nosaukums (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "nevar parsēt ierīces nosaukumu"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "nederīga aparatūras adrese"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "nederīgs %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "ierīce"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "nederīgs %s (%s) "
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Nezināmas kļūdas dēļ neizdevās atjaunināt savienojuma noslēpumus (secrets)."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Šim savienojumam _izmantot datu centra tiltu (DCB)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Plūsmas vadība"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Iespēja"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Ieslēgt"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Reklamēt"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Labprātīgi"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Opcijas…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioritāšu grupas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Karkass"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioritātes plūsmas kontrole"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Ieslēgt vai izslēgt prioritāšu pauzi pārsūtīšanai katrai lietotāja "
 "prioritātei."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-#| msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Datplūsmas klase"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Strikta platjosla"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Prioritātes platjosla"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Grupas platjosla"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-#| msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Grupas ID"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Ievadiet prioritāšu grupas ID katrai lietotāja prioritātei."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1651,430 +1697,443 @@ msgstr ""
 "Ievadiet atļauto saites joslas platumu procentus, ko drīkst izmantot katra "
 "prioritāšu grupa. Visu grupu kopējai summai ir jābūt 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Ievadiet prioritāšu grupas platjoslas procentus, ko var izmantot katra "
 "lietotāja prioritāte."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Ieslēgt vai izslēgt striktu platjoslu katrai lietotāja prioritātei."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Ievadiet datplūsmas klasi katrai lietotāja prioritātei."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-#| msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "_Lietotājvārds"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Lietotājvārds, ko izmanot, lai autentificētos ar PPPoE pakalpojumu."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr ""
-"Iniciēt sesijas tikai ar piekļuvi koncentratoriem, kas sniedz norādīto"
-" pakalpojumu. Vairumam pakalpojumu sniedzējiem šo vajadzētu atstāt tukšu."
+"Iniciēt sesijas tikai ar piekļuvi koncentratoriem, kas sniedz norādīto "
+"pakalpojumu. Vairumam pakalpojumu sniedzējiem šo vajadzētu atstāt tukšu."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#| msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Pakalpojums"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Rādīt paroli"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Parole, ko izmanot, lai autentificētos ar PPPoE pakalpojumu."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-#| msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Parole"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
-#| msgid "_Parent interface:"
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "PPP _saskarne"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
-#| msgid "_Parent interface:"
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "Vecāka s_askarne"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Patvaļīgs nosaukums, ko piešķirt jaunizveidotajai PPP saskarnei."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Saskarne, uz kuras tiks izveidots PPP savienojums."
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Vecāka s_askarne"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Vītais pāris (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Piesaistes bloka saskarne (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "No vides neatkarīga saskarne (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Puse"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Pilns"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorēt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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:191
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Pašrocīgi"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-#| msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Ports"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Ierīce"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-#| msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "K_lonēta MAC adrese"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Attālinātā aktivizēšana"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Noklusējuma"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorēt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Uniraide"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_tiraide"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Apraide"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Attālinātās aktivizēšanas parole"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"Attālinātās aktivizēšanas parole (Ethernet MAC). Tas der tikai maģiskajām"
-" paketēm."
+"Attālinātās aktivizēšanas parole (Ethernet MAC). Tas der tikai maģiskajām "
+"paketēm."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Sai_tes saskaņošana"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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 ""
-"Ierīces saites saskaņošana. Ja ir izvēlēts “Pašrocīgi”, vērtības “Ātrums” un"
-" “Duplekss” tiks uzspiestas, nepārbaudot ierīču savietojamību. Ja neesat"
-" pārliecināts, atstājiet “Ignorēt” vai izvēlieties “Automātiski”."
+"Ierīces saites saskaņošana. Ja ir izvēlēts “Pašrocīgi”, vērtības “Ātrums” un "
+"“Duplekss” tiks uzspiestas, nepārbaudot ierīču savietojamību. Ja neesat "
+"pārliecināts, atstājiet “Ignorēt” vai izvēlieties “Automātiski”."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-#| msgid "_Speed:"
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "Ātrum_s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 ""
-"Ātruma vērtība statiskas saites saskaņošanai, kas ir nepieciešama tikai tad,"
-" ja nav izvēlētas opcijas “Ignorēt” vai “Automātiski”. Pirms norādāt ātruma"
-" vērtību, pārliecinieties, ka jūsu ierīce to atbalsta."
+"Ātruma vērtība statiskas saites saskaņošanai, kas ir nepieciešama tikai tad, "
+"ja nav izvēlētas opcijas “Ignorēt” vai “Automātiski”. Pirms norādāt ātruma "
+"vērtību, pārliecinieties, ka jūsu ierīce to atbalsta."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_kss"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 ""
-"Dupleksa vērtība statiskas saites saskaņošanai, kas ir nepieciešama tikai"
-" tad, ja nav izvēlētas opcijas “Ignorēt” vai “Automātiski”. Pirms norādāt"
-" dupleksa režīmu, pārliecinieties, ka jūsu ierīce to atbalsta."
+"Dupleksa vērtība statiskas saites saskaņošanai, kas ir nepieciešama tikai "
+"tad, ja nav izvēlētas opcijas “Ignorēt” vai “Automātiski”. Pirms norādāt "
+"dupleksa režīmu, pārliecinieties, ka jūsu ierīce to atbalsta."
 
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "Automātiski savienoties ar _VPN, kad izmanto šo savienojumu"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Jā"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Nē"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Visi lietotāji drīkst savienoties ar šo tīkl_u"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Automātiski savienoties ar šo tīklu, kad tas ir pieejams"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Automātiski savienoties ar _VPN, kad izmanto šo savienojumu"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation"
-msgstr "Savienojuma _prioritāte automātiskai aktivizēšanai"
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr "Ugunsmūra _zona"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Sajūg_tie savienojumi"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Savienoties _automātiski"
+
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
 "Default value is 0."
 msgstr ""
-"Savienojuma prioritāte automātiskai aktivizēšanai. Savienojumiem ar lielāku"
-" numuru ir priekšroka, kad tiek izvēlēti profili automātiskai aktivizēšanai."
-" Noklusējuma vērtība ir 0."
+"Savienojuma prioritāte automātiskai aktivizēšanai. Savienojumiem ar lielāku "
+"numuru ir priekšroka, kad tiek izvēlēti profili automātiskai aktivizēšanai. "
+"Noklusējuma vērtība ir 0."
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
-#| msgid "Firewall _zone:"
-msgid "Firewall _zone"
-msgstr "Ugunsmūra _zona"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
-"IP adrese identificē jūsu datoru tīklā. Spiediet “Pievienot”, lai pievienotu"
-" statisku IP adresi, ko konfigurēt klāt automātiskajai."
+"IP adrese identificē jūsu datoru tīklā. Spiediet “Pievienot”, lai pievienotu "
+"statisku IP adresi, ko konfigurēt klāt automātiskajai."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 ""
-"IP adrese identificē jūsu datoru tīklā un nosaka adrešu apgabalu, kas ir"
-" izdalīts citiem datoriem. Spiediet pogu “Pievienot”, lai pievienotu IP"
-" adresi. Ja nav sniegta adrese, apgabals tiks noteikts automātiski."
+"IP adrese identificē jūsu datoru tīklā un nosaka adrešu apgabalu, kas ir "
+"izdalīts citiem datoriem. Spiediet pogu “Pievienot”, lai pievienotu IP "
+"adresi. Ja nav sniegta adrese, apgabals tiks noteikts automātiski."
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Papildu statiskās adreses"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adreses"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adreses (neobligāts)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagramma"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-#| msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "_Transporta režīms"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Ierīces nosaukums"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Vecāka ierīce"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Režīms"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Lokālā IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Attālinātā IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Ievades atslēga"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Izvades atslēga"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automātiski ar pašrocīgiem DNS iestatījumiem"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Lokālais tīkls"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:211
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Koplietots ar citiem datoriem"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#| msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Metode"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2084,8 +2143,8 @@ msgstr ""
 "konfigurāciju. Ja vēlaties izmantot DHCP klienta identifikatoru, ievadiet to "
 "šeit."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2093,28 +2152,23 @@ msgstr ""
 "Domēni, kurus izmantot, meklējot datoru vārdus. Vairākus domēnus atdaliet ar "
 "komatu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#| msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "D_HCP klienta ID"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-#| msgid "S_earch domains:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "M_eklēšanas domēni"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-#| msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "_DNS serveri"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2122,11 +2176,11 @@ msgstr ""
 "DNS (domēnu nosaukumu serveru) adreses, kuras izmantot, meklējot datoru "
 "nosaukumus. Vairākas DNS adreses atdaliet ar komatu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Šī savienojuma pabeigšanai nepieciešama IPv4 adresācija"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2135,34 +2189,34 @@ msgstr ""
 "tad, ja neizdodas izveidot IPv4 konfigurāciju, bet IPv6 konfigurācija "
 "izdodas."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "Marš_ruti…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Izslēgts"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Ieslēgts (dot priekšroku publiskai adresei)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Ieslēgts (dot priekšroku pagaidu adresei)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Stabils privātums"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2172,20 +2226,19 @@ msgstr ""
 "nosaukumus. Vairākas DNS adreses atdaliet ar komatu. Lokālā tīkla adreses "
 "tiks automātiski pieliktas pie savienotās saskarnes."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-#| msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 _privātuma paplašinājumi"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "IPv6 adreses ģenerēšanas _režīms"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Šī savienojuma pabeigšanai nepieciešama IPv6 adresācija"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2194,1005 +2247,965 @@ msgstr ""
 "tad, ja neizdodas izveidot IPv6 konfigurāciju, bet IPv4 konfigurācija "
 "izdodas."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Pārbaudīt"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
-#| msgid "Metric"
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Strikts"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "MACsec ierīces nosaukums."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
-"Vecāka saskarnes nosaukums vai vecāka savienojuma UUID, kuram vajadzētu"
-" izveidot šo MACSEC saskarni."
+"Vecāka saskarnes nosaukums vai vecāka savienojuma UUID, kuram vajadzētu "
+"izveidot šo MACSEC saskarni."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
-"Vecāka saskarnes nosaukums vai vecāka savienojuma UUID, kuram vajadzētu"
-" izveidot šo MACsec saskarni"
+"Vecāka saskarnes nosaukums vai vecāka savienojuma UUID, kuram vajadzētu "
+"izveidot šo MACsec saskarni"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Iepriekš koplietotās savienojumu asociācijas atslēgas (CAK) nosaukums"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Iepriekš koplietotā savienojumu asociācijas atslēga (CAK)"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
-"Norāda, kā tiek iegūta CAK (Connectivity Association Key) priekš MKA (MACsec"
-" Key Agreement). EPA režīmam aizpildiet parametrus 802.1X drošības lapā"
+"Norāda, kā tiek iegūta CAK (Connectivity Association Key) priekš MKA (MACsec "
+"Key Agreement). EPA režīmam aizpildiet parametrus 802.1X drošības lapā"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Atslēgas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parametri"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Validācija"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-#| msgid "_Import"
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI ports"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Norāda validācijas režīmu ienākošajiem kadriem"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Šifrēt"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Vai pārsūtītajai datplūsmai ir jābūt šifrētai"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "SCI (drošais kanāla identifikators) porta komponente"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Vienkāršs"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-#| msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Nu_murs"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Paplašināti"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#| msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-#| msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "_Tīkla ID"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Mainīt…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-#| msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "PI_N"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Atļaut _viesabonēšanu, ja mājas tīkls nav pieejams"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Rādīt paroles"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-#| msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Atļautās metodes"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfigurēt _metodes…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Saspiešana"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Izmantot divp_unktu šifrēšanu (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Piep_rasīt 128 bitu šifrēšanu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Izmantot _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Atļaut _BSD datu saspiešanu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Atļaut _Deflate datu saspiešanu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Izmantot TCP _galvenes saspiešanu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Atbalss"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Sūtīt PPP atbalss pak_eti"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Nav"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Tikai pārlūkam"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Izmantot šo starpnieka konfigurāciju tikai pārlūku klientiem / shēmām."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "PAC skripts"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL adrese, no kuras saņemt PAC skriptu."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importēt skriptu no datnes…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Metode"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "P_aplašināti…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Iestata vedējs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Ethernet porta stāvoklis"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Sajūguma papildu opcijas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "_Rindas ID"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
 msgstr ""
-"Negaidītu NA un neprasītu ARP pakotņu skaits, nosūtīti pēc tam, kad ports ir"
-" atvērts vai aizvērts."
+"Negaidītu NA un neprasītu ARP pakotņu skaits, nosūtīti pēc tam, kad ports ir "
+"atvērts vai aizvērts."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID rindai, uz kuru vajadzētu attēlot šo portu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Aktīvā dublējuma skrējēja opcijas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Porta prioritāte"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
 msgstr ""
-"Vērtība ir pozitīvs skaitlis, izteikta milisekundēs. Norāda intervālu starp"
-" biedru informējošām paketēm."
+"Vērtība ir pozitīvs skaitlis, izteikta milisekundēs. Norāda intervālu starp "
+"biedru informējošām paketēm."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Porta prioritāte. Lielāks skaitlis nozīmē augstāku prioritāti."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Porta lipīgum_s"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
-"Validēt saņemtās ARP paketes aktīvajos portos. Ja šis nav atzīmēts, visas"
-" ienākošās ARP paketes tiks uzskatītas kā labas atbildes."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP skrējēja opcijas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "_LACP porta prioritāte"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "LACP porta _atslēga"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
 msgstr ""
-"Multiraides grupu atkārtotas pievienošanas pieprasījumu skaits, nosūtīti pēc"
-" tam, kad ports ir atvērts vai aizvērts."
+"Multiraides grupu atkārtotas pievienošanas pieprasījumu skaits, nosūtīti pēc "
+"tam, kad ports ir atvērts vai aizvērts."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
-"Porta prioritāte pēc LACP standarta. Zemāks skaitlis nozīmē augstāku"
-" prioritāti."
+"Porta prioritāte pēc LACP standarta. Zemāks skaitlis nozīmē augstāku "
+"prioritāti."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
 msgstr ""
-"Vērtība ir pozitīvs skaitlis, izteikta milisekundēs. Norāda intervālu starp"
-" grupu atkārtotas pievienošanas pieprasījumiem."
+"Vērtība ir pozitīvs skaitlis, izteikta milisekundēs. Norāda intervālu starp "
+"grupu atkārtotas pievienošanas pieprasījumiem."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr ""
-"Porta atslēga pēc LACP standarta. Sakopot var tikai portus ar vienādām"
-" atslēgām."
+"Porta atslēga pēc LACP standarta. Sakopot var tikai portus ar vienādām "
+"atslēgām."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "_Saites novērotājs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Aktivēšanas aizt_ure"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "_Deaktivēšanas aizture"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "Sūtīt _intervālu"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Aizture _pirms pirmās sūtīšanas"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Maksimums nedoto atbilžu"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "Avota re_sursdators"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "Mērķa resursda_tors"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
 msgstr ""
-"Maksimums nedoto atbilžu skaits. Ja šis skaitlis tiek pārsniegts, saite tiek"
-" uzskatīta par neaktīvu."
+"Maksimums nedoto atbilžu skaits. Ja šis skaitlis tiek pārsniegts, saite tiek "
+"uzskatīta par neaktīvu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr ""
-"Datora nosaukumu var pārveidot par IP adresi, kas tiks ielikta ARP"
-" pieprasījumā kā avota adrese."
+"Datora nosaukumu var pārveidot par IP adresi, kas tiks ielikta ARP "
+"pieprasījumā kā avota adrese."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr ""
-"Datora nosaukumu var pārveidot par IP adresi, kas tiks ielikta pieprasījumā"
-" kā mērķa adrese."
+"Datora nosaukumu var pārveidot par IP adresi, kas tiks ielikta pieprasījumā "
+"kā mērķa adrese."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignorēt nederīgās paketes no _aktīvajiem portiem"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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 ""
+"Validēt saņemtās ARP paketes aktīvajos portos. Ja šis nav atzīmēts, visas "
+"ienākošās ARP paketes tiks uzskatītas kā labas atbildes."
+
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignorēt nederīgās paketes no _neaktīvajiem portiem"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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 ""
-"Validēt saņemtās ARP paketes neaktīvajos portos. Ja šis nav atzīmēts, visas"
-" ienākošās ARP paketes tiks uzskatītas kā labas atbildes."
+"Validēt saņemtās ARP paketes neaktīvajos portos. Ja šis nav atzīmēts, visas "
+"ienākošās ARP paketes tiks uzskatītas kā labas atbildes."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "Sūtīt n_eaktīvos portos"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
 msgstr ""
-"Pēc noklusējuma ARP pieprasījumi tiek sūtīti tikai uz aktīvajiem portiem. Šī"
-" opcija atļauj sūtīt pat uz neaktīvajiem portiem."
+"Pēc noklusējuma ARP pieprasījumi tiek sūtīti tikai uz aktīvajiem portiem. Šī "
+"opcija atļauj sūtīt pat uz neaktīvajiem portiem."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr "Aizture starp saites aktivēšanos un skrējēja informēšanu par to."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "Aizture starp saites deaktivēšanos un skrējēja informēšanu par to."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Intervāls starp pieprasījumu nosūtīšanu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
-"Aizture starp saites novērošanas inicializēšanu un pirmā pieprasījuma"
-" nosūtīšanu."
+"Aizture starp saites novērošanas inicializēšanu un pirmā pieprasījuma "
+"nosūtīšanu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Saites novērotājs, kuru izmantot."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Saites novērotājs"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_portēt komandas konfigurāciju no datnes…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Rediģēt _JSON konfigurāciju"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Neapstrādāta konfigurācija"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Augstākā prioritāte"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Augstākā prioritāte (stabils)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Joslas platums"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Augstākais portu skaits"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Porta prioritāte"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "No sajūga ierīces"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "No aktīvā porta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "No aktīvās uz sajūga ierīces"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-#| msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Sajūg_tie savienojumi"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Noslodzes līdzsvarošana"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Vadu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Jebkurš L3 protokols"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Jebkurš L4 protokols"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "_Biedru paziņojumu skaits"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "_Biedru paziņojumu intervāls"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "_Multiraides atkārtotas pievienošanas skaits"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "Multiraides atkā_rtotas pievienošanas intervāls"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Aparatūras adrese"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
-"Vēlamā aparatūras adrese jaunai sajūga ierīcei. Tiek pieņemts parastais MAC"
-" formāts."
+"Vēlamā aparatūras adrese jaunai sajūga ierīcei. Tiek pieņemts parastais MAC "
+"formāts."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "Sk_rējējs"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "_Aparatūras adreses politika"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Nosaukums skrējējam, kuru izmantot."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
 msgstr ""
-"Šis nosaka politiku, kā aparatūras adreses sajūga ierīcēm un porta ierīcēm"
-" vajadzētu būt iestatītām sajūga dzīves laikā."
+"Šis nosaka politiku, kā aparatūras adreses sajūga ierīcēm un porta ierīcēm "
+"vajadzētu būt iestatītām sajūga dzīves laikā."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "_Periodiski sūtīt LACPDU kadrus"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
 msgstr ""
-"Ja atzīmēts, LACPDU kadri tiek sūtīti kopā ar konfigurētajām saitēm"
-" periodiski. Ja nē, tas rīkojas kā “runāt, kad tiek uzrunāts”."
+"Ja atzīmēts, LACPDU kadri tiek sūtīti kopā ar konfigurētajām saitēm "
+"periodiski. Ja nē, tas rīkojas kā “runāt, kad tiek uzrunāts”."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Sūtīt LACPDU kadru ik s_ekundu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 ""
-"Opcija norāda ātrumu, ar kādu mūsu saites partneris prasām sūtīt LACPDU"
-" paketes. Ja atzīmēts, paketes tiks sūtītas ik pēc sekundes. Citādi tās tiks"
-" sūtītas reizi 30 sekundēs."
+"Opcija norāda ātrumu, ar kādu mūsu saites partneris prasām sūtīt LACPDU "
+"paketes. Ja atzīmēts, paketes tiks sūtītas ik pēc sekundes. Citādi tās tiks "
+"sūtītas reizi 30 sekundēs."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Sistēmas prioritāte"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "_Minimālais ports"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "_Apkopotāja izvēles politika"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Sistēmas prioritāte, vērtība var būt 0 – 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
 msgstr ""
-"Norāda minimālo portu skaitu, kuriem ir jābūt aktīviem pirms paziņot nesēju"
-" galvenajā saskarnē, vērtība var būt 1 – 255."
+"Norāda minimālo portu skaitu, kuriem ir jābūt aktīviem pirms paziņot nesēju "
+"galvenajā saskarnē, vērtība var būt 1 – 255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Šis izvēlas politiku, kā tiks izvēlēts apkopotājs."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr ""
-"Saraksts ar fragmentu tipiem (virknes), kurus vajadzētu izmantot pakešu Tx"
-" jaucējvērtības aprēķināšanai."
+"Saraksts ar fragmentu tipiem (virknes), kurus vajadzētu izmantot pakešu Tx "
+"jaucējvērtības aprēķināšanai."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "Lauki pārraides _jaucējvērtībai"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "Periodiskais intervāls starp pārbalansēšanu. Izteikts sekunžu desmitdaļās."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
-"Aktīvā Tx balansētāja nosaukums. Aktīva Tx balansēšana ir pēc noklusējuma"
-" izslēgta."
+"Aktīvā Tx balansētāja nosaukums. Aktīva Tx balansēšana ir pēc noklusējuma "
+"izslēgta."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Pārraides _balansēšanas intervāls"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "_Pārraides balansētājs"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Skrējējs"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Vecāka saskarne"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "VLAN saskarnes _nosaukums"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Klonēta MAC _adrese"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-#| msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN _id"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Karogi"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "Pā_rkārtot galvenes"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Vaļīga sasaiste"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Ierīces nosaukums + numurs"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + numurs"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-#| msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "_Drošība"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klients"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Tīklājs"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ekspromta"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-#| msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Pārraides ja_uda"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-#| msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "Āt_rums"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-#| msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-#| msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Kanāls"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-#| msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "_Josla"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-#| msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "_SSID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nav polkit pilnvaru veikt darbību"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Atļautās autentificēšanas metodes"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versija 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 "Vairumā gadījumu PPP serveru pakalpojuma sniedzējs atbalstīs visas "
-"autentifikācijas metodes. Ja neizdodas savienoties, pamēģiniet izslēgt "
-"dažu metožu atbalstu."
+"autentifikācijas metodes. Ja neizdodas savienoties, pamēģiniet izslēgt dažu "
+"metožu atbalstu."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Bezvadu"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Saistīts"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Sajūgts"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:233
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Tilts"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP tunelis"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN spraudnim neizdevās pareizi importēt VPN savienojumu\n"
-"\n"
-"Kļūda — nav VPN servisa tips."
-
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Nevar importēt VPN savienojumu"
 
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Datni “%s” nevar nolasīt vai tajā nav atpazīstama VPN savienojuma "
-"informācija\n"
+"VPN spraudnim neizdevās pareizi importēt VPN savienojumu\n"
 "\n"
-"Kļūda — %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "nezināma kļūda"
+"Kļūda — nav VPN servisa tips."
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Izvēlieties datni, ko importēt"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Aparatūra"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuāls"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importē saglabātu VPN savienojumu…"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3200,76 +3213,83 @@ msgstr ""
 "Nevarēja inicializēt savienojumu redaktora dialoglodziņu, jo gadījās "
 "nezināma kļūda."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Nevarēja izveidot jaunu savienojumu"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Neizdevās izdzēst savienojumu"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Vai tiešām vēlaties dzēst savienojumu %s?"
 
-#: ../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:1118
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN savienojumi"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adrese"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Tīkla maska"
 
-#: ../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:1156
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Vārteja"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefikss"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Rediģē %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Rediģē nenosauktus savienojumus"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Trūkt savienojuma nosaukuma"
 
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Redaktors inicializējas…"
 
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Savienojumu nevar modificēt"
 
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Nederīgi iestatījumi %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3277,105 +3297,104 @@ msgstr ""
 "Savienojumu redaktors nevarēja atrast dažus vajadzīgos resursus (.ui datne "
 "netika atrasta)."
 
-#: ../src/connection-editor/nm-connection-editor.c:574
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Saglabāt jebkuras izmaiņas, kas veiktas ar šo savienojumu."
 
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentificējieties, lai saglabātu šo savienojumu viesiem šī datora "
 "lietotājiem."
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Nevarēja izveidot savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Nevarēja rediģēt savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nezināma kļūda, veidojot savienojuma redaktora dialoglodziņu."
 
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
-"Brīdinājums — savienojums satur īpašības, kuras redaktors neatbalsta."
-" Saglabāšanas laikā tās tiks attīrītas."
+"Brīdinājums — savienojums satur īpašības, kuras redaktors neatbalsta. "
+"Saglabāšanas laikā tās tiks attīrītas."
 
-#: ../src/connection-editor/nm-connection-editor.c:755
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Kļūda, inicializējot redaktoru"
 
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Neizdevās pievienot savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Labot"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
-"Drošības iezīmes var neļaut dažām datnēm tikt izmantotām ar sertifikātu"
-" autentifikāciju."
+"Drošības iezīmes var neļaut dažām datnēm tikt izmantotām ar sertifikātu "
+"autentifikāciju."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Savienojuma _nosaukums"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Eksportēt…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Datņu pārmarķēšana"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "Pā_rmarķēt"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
-"Sekojošās datnes nav marķētas izmantošanai ar sertifikātu institūciju. Vai"
-" vēlaties pielāgot etiķetes?"
+"Sekojošās datnes nav marķētas izmantošanai ar sertifikātu institūciju. Vai "
+"vēlaties pielāgot etiķetes?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Pārmarķēt"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Datnes nosaukums"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nekad"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "tagad"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3383,7 +3402,7 @@ msgstr[0] "Pirms %d minūtes"
 msgstr[1] "Pirms %d minūtēm"
 msgstr[2] "Pirms %d minūtēm"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3391,7 +3410,7 @@ msgstr[0] "Pirms %d stundas"
 msgstr[1] "Pirms %d stundām"
 msgstr[2] "Pirms %d stundām"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3399,7 +3418,7 @@ msgstr[0] "Pirms %d dienas"
 msgstr[1] "Pirms %d dienām"
 msgstr[2] "Pirms %d dienām"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3407,7 +3426,7 @@ msgstr[0] "Pirms %d mēneša"
 msgstr[1] "Pirms %d mēnešiem"
 msgstr[2] "Pirms %d mēnešiem"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3415,136 +3434,159 @@ msgstr[0] "Pirms %d gada"
 msgstr[1] "Pirms %d gadiem"
 msgstr[2] "Pirms %d gadiem"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Savienojumu nevar izdzēst"
 
-#: ../src/connection-editor/nm-connection-list.c:448
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Izvēlieties savienojumu, ko rediģēt"
 
-#: ../src/connection-editor/nm-connection-list.c:450
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Izvēlieties savienojumu, ko izdzēst"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nosaukums"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Iepriekš lietotās"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Rediģēt izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentificējieties, lai rediģētu izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Dzēst izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentificējieties, lai dzēstu izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Neatbalstīts mobilās platjoslas tīkla savienojuma veids."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Nezina, kā izveidot “%s” savienojumus"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Kļūda, rediģējot savienojumu"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Kļūda, veidojot savienojumu"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Savienojumu nevar modificēt"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Nav instalētu VPN spraudņu."
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Nezina, kā izveidot “%s” savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Kļūda, rediģējot savienojumu"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Neatrada savienojumu ar UUID “%s”"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Tīkla savienojumi"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Pievienot jaunu savienojumu"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X drošība"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Nevarēja ielādēt 802.1X drošības lietotāja saskarni."
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Šim savienojumam izmantot 802.1_X drošību"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAC adrese Bluetooth ierīcei. Piemērs: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Nevarēja ielādēt Bluetooth lietotāja saskarni."
 
-#: ../src/connection-editor/page-bluetooth.c:173
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "nederīga Bluetooth ierīce (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:256
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth savienojums %d"
 
-#: ../src/connection-editor/page-bluetooth.c:306
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth veids"
 
-#: ../src/connection-editor/page-bluetooth.c:324
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Izvēlieties Bluetooth savienojuma profila tipu."
 
-#: ../src/connection-editor/page-bluetooth.c:329
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Personālais tīkls"
 
-#: ../src/connection-editor/page-bluetooth.c:334
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "_Iezvantīkls"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Nevarēja ielādēt saistīto lietotāja saskarni."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primārais"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Saistītais savienojums %d"
 
-#: ../src/connection-editor/page-bridge.c:236
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Nevarēja ielādēt tilta lietotāja saskarni."
 
-#: ../src/connection-editor/page-bridge.c:352
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Tilta savienojums %d"
@@ -3552,81 +3594,79 @@ msgstr "Tilta savienojums %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Tilta ports"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Nevarēja ielādēt tilta porta lietotāja saskarni."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Nevarēja ielādēt DCB lietotāja saskarni."
 
-#: ../src/connection-editor/page-dsl.c:203
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Nevarēja ielādēt DSL lietotāja saskarni."
 
-#: ../src/connection-editor/page-dsl.c:298
-#| msgid "_Parent interface:"
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "trūkst vecāka saskarne"
 
-#: ../src/connection-editor/page-dsl.c:343
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL savienojums %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
-"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes"
-" nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “em1”,"
-" “3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
+"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes "
+"nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “em1”, "
+"“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ignorēts"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Nevarēja ielādēt vadu tīkla lietotāja saskarni."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet ierīce"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klonēts MAC"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Attālinātās aktivizēšanas parole"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Vadu tīkla savienojums %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:807
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Noklusējuma"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3636,186 +3676,174 @@ msgstr ""
 "izvēloties tiks izmantota noklusējuma zona, kas ir iestatīta ugunsmūrī. "
 "Izmantojams tikai, ja ir aktīvs ugunsmūris."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Nevarēja ielādēt vispārīgo lietotāja saskarni."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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)”"
 msgstr ""
-"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes"
-" nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “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)”"
+"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes "
+"nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “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)”"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Nevarēja ielādēt InfiniBand lietotāja saskarni."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband ierīce"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand savienojums %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Nevarēja ielādēt IP tuneļa lietotāja saskarni."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP tuneļa savienojums %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automātiski (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automātiski (VPN) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automātiski, tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automātiski (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automātiski (PPPoE) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automātiski (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automātiski (DHCP) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Tikai lokālais tīkls"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-#| msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Papildu _DNS serveri"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-#| msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Papildu m_eklēšanas domēni"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediģē %s IPv4 maršrutus"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 iestatījumi"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Nevarēja ielādēt IPv4 lietotāja saskarni."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 adrese “%s” nav derīga"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 adreses tīkla maska “%s” nav derīga"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 vārteja “%s” nav derīga"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS serveris “%s” nav derīgs"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automātiski, tikai DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediģē %s IPv6 maršrutus"
 
-#: ../src/connection-editor/page-ip6.c:1208
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 iestatījumi"
 
-#: ../src/connection-editor/page-ip6.c:1210
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Nevarēja ielādēt IPv6 lietotāja saskarni."
 
-#: ../src/connection-editor/page-ip6.c:1302
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 adrese “%s” nav derīga"
 
-#: ../src/connection-editor/page-ip6.c:1310
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 prefiks “%s” nav derīgs"
 
-#: ../src/connection-editor/page-ip6.c:1319
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 vārteja “%s” nav derīga"
 
-#: ../src/connection-editor/page-ip6.c:1361
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS serveris “%s” nav derīgs"
 
-#: ../src/connection-editor/page-macsec.c:192
-#| msgid "Could not load WiMAX user interface."
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Nevarēja ielādēt MACsec lietotāja saskarni."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
-#| msgid "WiMAX connection %d"
 msgid "MACSEC connection %d"
 msgstr "MACSEC savienojums %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Dublēt sekotājus"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Abi sekotāji “%s” un “%s” attiecas uz ierīci “%s”"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3824,25 +3852,25 @@ msgstr ""
 "Sekotāji “%s” un “%s” attiecas uz dažādiem virtuālajiem portiem (“%s” un "
 "“%s”) vienai un tai pašai fiziskai ierīcei."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s sekotājs %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Nevarēja ielādēt mobilās platjoslas tīkla lietotāja saskarni."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Neatbalstīts mobilās platjoslas tīkla savienojuma veids."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izvēlieties mobilā savienojuma piegādātāja veidu"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3850,85 +3878,85 @@ msgstr ""
 "Izvēlieties tehnoloģiju, kuru izmanto mobilās platjoslas tīkla piegādātājs. "
 "Ja neesat pārliecināts, jautājiet piegādātājam."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mans operators izmanto _GSM tehnoloģiju (piemēram, GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mans operators izmanto C_DMA tehnoloģiju (piemēram, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "neviena"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Rediģē %s PPP autentifikācijas metodes"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP iestatījumi"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Nevarēja ielādēt PPP lietotāja saskarni."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Starpnieks"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Nevarēja ielādēt starpnieka lietotāja saskarni."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Kļūda — datne nesatur derīgu JSON konfigurāciju"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Nevarēja ielādēt sajūgto lietotāja saskarni."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Sajūgts savienojums %d"
@@ -3936,68 +3964,67 @@ msgstr "Sajūgts savienojums %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Sajūguma ports"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Nevarēja ielādēt sajūguma porta lietotāja saskarni."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (caur \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Jauns savienojums…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Nevarēja ielādēt vlan lietotāja saskarni."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan vecāks"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN savienojums %d"
 
-#: ../src/connection-editor/page-vpn.c:67
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Nevarēja ielādēt redaktora VPN spraudni servisam “%s” (%s)."
 
-#: ../src/connection-editor/page-vpn.c:68
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "nezināma kļūme"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Nevarēja ielādēt VPN lietotāja saskarni."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Nevarēja atrast VPN spraudni servisam “%s”."
 
-#: ../src/connection-editor/page-vpn.c:202
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN savienojums %d"
 
-#: ../src/connection-editor/page-vpn.c:208
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Izvēlieties VPN savienojumu veidu"
 
-#: ../src/connection-editor/page-vpn.c:209
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -4007,115 +4034,113 @@ msgstr ""
 "vajadzīgais VPN savienojuma veids, iespējams, ka nav uzinstalēts vajadzīgais "
 "VPN spraudnis."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
-"Šī opcija piesaista savienojumu bezvadu tīklam pieejas punktam "
-"(AP), kuru raksturo BSSID, kuru ievada šeit. Piemērs: 00:11:22:33:44:55"
+"Šī opcija piesaista savienojumu bezvadu tīklam pieejas punktam (AP), kuru "
+"raksturo BSSID, kuru ievada šeit. Piemērs: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
-"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes"
-" nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “wlan0”,"
-" “C:97:0E:42:A:19”, “wlan0 (C:97:0E:42:1A:19)”"
+"Šī opcija noslēdz šo savienojumu uz tīkla ierīci, ko norāda tā saskarnes "
+"nosaukums vai pastāvīgā MAC adrese, vai abi. Piemēram, “wlan0”, “C:97:0E:42:"
+"A:19”, “wlan0 (C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nevarēja ielādēt bezvadu lietotāja saskarni."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Bezvadu tīkla ierīce"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Bezvadu tīkla savienojums %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 bitu atslēga (Hex vai ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitu parole"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamiskais WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA un WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA un WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nevarēja ielādēt bezvadu tīkla drošības lietotāja saskarni — pietrūkst "
 "bezvadu tīkla iestatījumu."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Bezvadu tīkla drošība"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Nevarēja ielādēt bezvadu tīkla drošības lietotāja saskarni. Trūkst bezvadu "
 "iestatījumu."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "trūkstošs SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Drošība nav savietojama ar Ad-Hoc režīmu"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Datne ar nosaukumu “%s” jau eksistē."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Aizvietot"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vai vēlaties aizvietot %s ar saglabājamo VPN savienojumu?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nevar eksportēt VPN savienojumu"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4126,116 +4151,103 @@ msgstr ""
 "\n"
 "Kļūda — %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Eksportē VPN savienojumu…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Atbloķēt"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automātiski atbloķēt šo ierīci"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Savienojuma informācija"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktīvi tīkla savienojumi"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Nav iestatīts sertifikāts"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Nav iestatītas atslēgas"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izvēlieties atslēgu %s sertifikātam"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "%s privātā _atslēga:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "%s atslēgas _parole:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Izvēlieties %s sertifikātu"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "%s _sertifikāts:"
 
-#: ../src/libnma/nma-mobile-wizard.c:281
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mana valsts nav sarakstā"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nav sarakstā"
 
-#: ../src/libnma/nma-mobile-wizard.c:465
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mans plāns nav sarakstā…"
 
-#: ../src/libnma/nma-mobile-wizard.c:626
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Operators"
 
-#: ../src/libnma/nma-mobile-wizard.c:908
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Valsts vai reģions"
-
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mana valsts nav sarakstā"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Uzstādītā GSM ierīce"
 
-#: ../src/libnma/nma-mobile-wizard.c:1002
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Uzstādītā CDMA ierīce"
 
-#: ../src/libnma/nma-mobile-wizard.c:1208
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Jebkura ierīce"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Jauns mobilās platjoslas tīkla savienojums"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4243,108 +4255,87 @@ msgstr ""
 "Šis asistents palīdzēs jums ērti uzstādīt mobilās platjoslas tīkla "
 "savienojumu ar mobilo (3G) tīklu."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Jums vajadzēs sekojošo informāciju:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Jūsu platjoslas pakalpojuma sniedzēja nosaukums"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Jūsu platjoslas rēķinu plāna nosaukums"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(dažos gadījumos) platjoslas rēķinu plāna APN (pieejas punkta nosaukums)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Izveidot savienojumu šai mobilās pla_tjoslas tīkla ierīcei:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Iestatīt mobilās platjoslas tīkla savienojumu"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Valstu vai reģionu saraksts:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Valsts vai reģions"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Izvēlieties pakalpojuma sniedzēja valsti vai reģionu"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Izvē_lieties operatoru no saraksta:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 "Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt _pašrocīgi:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Mans operators izmanto GSM tehnoloģiju (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mans operators izmanto CDMA tehnoloģiju (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Operators:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Izvēlieties savu operatoru"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Izvēlietie_s plānu:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Izvēlēts plāns _APN (pieejas punkta nosaukums):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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."
 msgstr ""
-"Brīdinājums — nepareiza plāna izvēle var radīt problēmas ar rēķiniem"
-" platjoslas tīkla kontam, vai arī var neizdoties savienošanās.\n"
+"Brīdinājums — nepareiza plāna izvēle var radīt problēmas ar rēķiniem "
+"platjoslas tīkla kontam, vai arī var neizdoties savienošanās.\n"
 "\n"
 "Ja nezināt, kāds jums ir plāns, jautājiet sava plāna APN."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Izvēlieties rēķina plānu"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
@@ -4352,25 +4343,21 @@ msgstr ""
 "iestatījumiem:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Jūsu ierīce:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Jūsu operators:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jūsu plāns:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4378,155 +4365,146 @@ msgid ""
 "connection settings, choose “Network Connections” from the System → "
 "Preferences menu."
 msgstr ""
-"Tagad tiks izveidots savienojums ar jūsu mobilās platjoslas pakalpojuma"
-" sniedzēju, izmantojot jūsu izvēlētos iestatījumus. Ja savienojums neizdodas,"
-" vai jūs nevarat piekļūt tīkla resursiem, vēlreiz pārbaudiet iestatījumus."
-" Lai mainītu savas mobilās platjoslas tīkla iestatījumus, izvēlieties “Tīkla"
-" savienojumi” no izvēlnes Sistēma → Iestatījumi."
+"Tagad tiks izveidots savienojums ar jūsu mobilās platjoslas pakalpojuma "
+"sniedzēju, izmantojot jūsu izvēlētos iestatījumus. Ja savienojums neizdodas, "
+"vai jūs nevarat piekļūt tīkla resursiem, vēlreiz pārbaudiet iestatījumus. "
+"Lai mainītu savas mobilās platjoslas tīkla iestatījumus, izvēlieties “Tīkla "
+"savienojumi” no izvēlnes Sistēma → Iestatījumi."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Apstiprināt mobilās platjoslas iestatījumus"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(nav)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "%s atslēga"
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s sertifikāts"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Nezināms)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Izvēlēties"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Izvēlieties no datnes…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Izvēlieties %s sertifikātu"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
-#, c-format
-msgid "%s certificate _password:"
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
 msgstr "%s sertifikāta _parole:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Kļūda ierakstoties: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Kļūda, atverot sesiju: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Atbloķēt marķieri"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Izdevējs"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Ievadiet %s PIN"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Ierakstīties"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "Atce_rēties PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Glabā paroli tikai šim lietotājam"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Glabā paroli visiem lietotājiem"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Katru reizi prasīt paroli"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Parole nav nepieciešama"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Rādīt par_oles"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Terciārā parole:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundārā parole:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Spiediet, lai savienotos"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Vai nu trūkst paroles, vai arī savienojums ir nederīgs. Otrajā gadījumā jums"
-" vispirms jārediģē savienojums ar nm-connection-editor"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Jauns…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nav"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamiskais WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Iz_veidot"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4534,35 +4512,35 @@ msgstr ""
 "Lai piekļūtu bezvadu tīklam “%s”, ir nepieciešamas paroles vai šifrēšanas "
 "atslēgas."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Nepieciešama bezvadu tīkla autentifikācija"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bezvadu tīklam ir nepieciešama autentifikācija"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Izveidot jaunu bezvadu tīklu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Jauns bezvadu tīklu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Ievadiet izveidojamā bezvadu tīkla nosaukumu."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Savienoties ar slēptu bezvadu tīklu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Slēpts bezvadu tīkls"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4570,35 +4548,55 @@ msgstr ""
 "Ievadiet nosaukumu un drošības iestatījums bezvadu tīklam, ar kuru vēlaties "
 "savienoties."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Bez_vadu drošība:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Savien_ojums:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Bezv_adu tīkla ierīce:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Es nevaru atrast savu pakalpojuma sniedzēju un vēlos to ievadīt _pašrocīgi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Operators:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Valstu vai reģionu saraksts:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Valsts vai reģions"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Vadu"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC režģtīkls"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4608,17 +4606,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Vai nu trūkst paroles, vai arī savienojums ir nederīgs. Otrajā gadījumā jums "
+"vispirms jārediģē savienojums ar nm-connection-editor"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Bez_vadu drošība:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Tīkla _nosaukums:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Savien_ojums:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Bezv_adu tīkla ierīce:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Lietojums:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4626,401 +4648,445 @@ msgstr ""
 "Šī programmatūra ir daļa no NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "To nav paredzēts darbināt komandrindā, bet gan GNOME darbvirsmas vidē."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nav ieslēgts"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nav reģistrēts"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Mājas tīkls (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Mājas tīkls"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "meklē"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "reģistrācija ir liegta"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s viesabonēšana)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (viesabonēšana)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Viesabonēšanas tīkls (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Viesabonēšanas tīkls"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN kods SIM kartei “%s” ierīcē “%s”"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Ir nepieciešams PIN kods"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobilās platjoslas tīkla ierīcei ir vajadzīgs PIN kods"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobilās platjoslas savienojums “%s” ir aktīvs: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "viesabonēšana"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s savienojums"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM sertifikāti (*pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM vai PKCS#12 privātās atslēgas (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "nedefinēta kļūda 802.1X drošībā (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "nav izvēlēts CA sertifikāts"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "izvēlētā CA sertifikāta datne neeksistē"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "trūkst EAP-FAST PAC datnes"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Izvēlieties PAC datni"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC datne (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Visas datnes"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonīmi"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Ar autentifikāciju"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Abi"
 
-#: ../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:3
-#| msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Anonī_ma identitāte"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-#| msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "PAC _datne"
 
-#: ../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:1
-#| msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "_Iekšējā autentifikācija"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Atļaut automātisku PAC _nodrošinājumu"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "trūkst EAP-LEAP lietotājvārds"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "trūkst EAP-LEAP paroles"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versija 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versija 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Nav nepieciešams CA se_rtifikāts"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#| msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "PEAP _versija"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Servera sertifikāta nosaukuma sufikss."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domēns"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "trūkst EAP lietotājvārds"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "trūkst EAP paroles"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 bitu parole"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Rādīt paroli"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "trūkst EAP-TLS identitātes"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "nav izvēlēts lietotāja sertifikāts"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "izvēlētā lietotāja sertifikāta datne neeksistē"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "nav izvēlētu atslēgu"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "izvēlētā atslēgas datne neeksistē"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#| msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "I_dentitāte"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Nezināma kļūda validējot 802.1X drošību"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunelēts TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Aizsargāts EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "Au_tentifikācija"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "trūkst leap lietotāja"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "trūkst leap paroles"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "trūkst wep atslēgas"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
-"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai heksadecimālus"
-" skaitļus"
+"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai heksadecimālus "
+"skaitļus"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
-"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai ascii rakstzīmes"
+"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai ascii "
+"rakstzīmes"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
-"nederīga wep atslēga: nepareizs atslēgas garums %zu. Atslēgas garumam ir"
-" jābūt vai nu 5/13 "
-"(ascii) vai 10/26 (hex)"
+"nederīga wep atslēga: nepareizs atslēgas garums %zu. Atslēgas garumam ir "
+"jābūt vai nu 5/13 (ascii) vai 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "nederīga wep atslēga: parole nevar būt tukša"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "nederīga wep atslēga: parolei ir jābūt īsākai kā 64 rakstzīmes"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Atvērta sistēma"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Koplietošanas atslēga"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (noklusētais)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-#| msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Atslēga"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Rādīt atslēgu"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-#| msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP inde_kss"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
-"nederīgs wpa-psk: nederīgs atslēgas garums %zu. Jābūt [8,63] baiti vai 64"
-" heksadecimālie cipari"
+"nederīgs wpa-psk: nederīgs atslēgas garums %zu. Jābūt [8,63] baiti vai 64 "
+"heksadecimālie cipari"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "nederīgs wpa-psk: nevar interpretēt atslēgu ar 64 baitiem kā heksadecimālu"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-#| msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Tips"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (noklusējuma)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorēts"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Nezināmas kļūdas dēļ neizdevās atjaunināt savienojuma noslēpumus "
+#~ "(secrets)."
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Automātiski savienoties ar šo tīklu, kad tas ir pieejams"
+
+#~ msgid "Connection _priority for auto-activation"
+#~ msgstr "Savienojuma _prioritāte automātiskai aktivizēšanai"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Nevar importēt VPN savienojumu"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Datni “%s” nevar nolasīt vai tajā nav atpazīstama VPN savienojuma "
+#~ "informācija\n"
+#~ "\n"
+#~ "Kļūda — %s."
+
+#~ msgid "unknown error"
+#~ msgstr "nezināma kļūda"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Aktīvi tīkla savienojumi"
+
 #~ msgid "Priority:"
 #~ msgstr "Prioritāte:"
 
@@ -5393,15 +5459,6 @@ msgstr "_Tips"
 #~ msgid "%s Network"
 #~ msgstr "%s tīkls"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "Primārais DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Sekundārais DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Tercārais DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "_Saglabāt..."
 
@@ -5429,15 +5486,6 @@ msgstr "_Tips"
 #~ msgid "Don't _warn me again"
 #~ msgstr "_Vairs nebrīdināt"
 
-#~ msgid "No"
-#~ msgstr "Nē"
-
-#~ msgid "Yes"
-#~ msgstr "Jā"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Savienoties _automātiski"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Pieejams _visiem lietotajiem"
 
@@ -5853,9 +5901,6 @@ msgstr "_Tips"
 #~ msgid "Select the Private Key File"
 #~ msgstr "Izvēlieties privātās atslēgas failu"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Rādīt paroli"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "_Vienmēr uzticēties šim bezvadu tīlaam"
 
diff --git a/po/mk.po b/po/mk.po
index 27be4d15..518f5a27 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-12-24 21:35+0100\n"
 "Last-Translator: Jovan N\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -22,39 +23,48 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Менаџирајте со Вашите мрежни врски"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Мрежни врски"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "_Рачна конфигурација"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Управувајте и променувајте ги поставувањата на Вашата мрежна врска"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Оневозможи ги сите известувања за поврзување"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Поставете го ова на TRUE за да ги оневозможите известувањата при поврзување "
 "на мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Оневозможи ги сите известувања за исклучување"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -62,12 +72,12 @@ msgstr ""
 "Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
 "од мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Оневозможи ги сите известувања за поврзување"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -76,11 +86,11 @@ msgstr ""
 "Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
 "од мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Скриј ги известувањата за достапни мрежи"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -88,21 +98,22 @@ msgstr ""
 "Поставете го ова на TRUE за да ги оневозможите известувањата кога се "
 "достапни безжични мрежи."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Марка"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Се користи за да се одреди дали поставувањата ќе се мигрираат на понова "
 "верзија."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Оневозможи креирање на Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -110,162 +121,175 @@ msgstr ""
 "Поставете го ова на TRUE за да го оневозможите креирањето на adhoc мрежи "
 "кога се користи овој аплет."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Изберете CA сертификат"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Аплет за менаџирање со мрежи"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Нема мрежна врска"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "- Својства за VPN на NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Жичена 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "В_рзи се"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Име на _мрежа:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Не успеав да креирам PAN врска: %s"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "Непознато"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Додавањето на врска не успеа"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "прекината врска"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Прекината врска"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Додавањето на врска не успеа"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Не ја покажувај оваа порака повторно"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -285,7 +309,7 @@ msgstr ""
 "\n"
 "VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -294,7 +318,7 @@ msgstr ""
 "\n"
 "VPN врската „%s“ не успеа поради тоа што VPN сервисот прекина неочекувано."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "VPN врската „%s“ не успеа поради тоа што VPN сервисот врати невалидна "
 "конфигурација."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "VPN врската „%s“ не успеа поради тоа што обидот за врска истече."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "VPN врската „%s“ не успеа поради тоа што VPN сервисот не се стартуваше на "
 "време."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "VPN врската „%s“ не успеа поради тоа што VPN сервисот не успеа да се "
 "стартува."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за "
 "најава."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -354,7 +378,7 @@ msgstr ""
 "VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за "
 "најава."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -363,7 +387,7 @@ msgstr ""
 "\n"
 "VPN врската „%s“ не успеа."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -371,19 +395,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN најавна порака"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN врската не успеа"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -397,7 +421,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -410,330 +434,341 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "уредот не е подготвен (недостасува firmware)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "уредот не е подготвен"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "прекината врска"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Исклучи се"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "уредот не е менаџиран"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Нема достапни мрежни уреди"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN поврзувања"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Конфигурирај VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Додај ново VPN поврзување"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Менаџерот за мрежа работи..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Вмрежувањето е оневозможено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Овозможи _вмрежување"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Овозможи _безжична мрежа"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Овозможи _мобилна широкопојасна врска"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Овозможи и_звестувања"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Информации за поврзувањето"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Уреди врски..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_За"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Сега сте поврзани со „%s“."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Прекината врска"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Мрежното поврзување се прекина"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Ја подготвувам мрежата врска „%s“..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Потребна е автентикација на корисникот за мрежната врска „%s“..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Барам мрежна адреса за „%s“..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Мрежната врска „%s“ е активна"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Ја започнувам VPN врската „%s“..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Потребна е автентикација на корисникот за VPN врската „%s“..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Барам VPN адреса за „%s“..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN врската „%s“ е активна"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Нема мрежна врска"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Аплет за менаџирање со мрежи"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Погрешен PUK код. Ве молам, контактирајте со Вашиот оператор."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Погрешен PIN код. Ве молам, контактирајте со Вашиот оператор."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Испраќам код за отклучување..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобилен широкопојасен пристап (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобилен бродбенд"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Достапно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Нова мобилна широкопојасна врска"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Врската е воспоставена"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Сега сте поврзани со широкопојасна мобилна мрежа."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Лозинка за широкопојасна мобилна мрежа"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Сега сте поврзани со домашната мрежа."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Сега сте поврзани со роаминг мрежа."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Сега сте поврзани со широкопојасна мобилна мрежа."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Ја подготвувам мобилната широкопојасна врска „%s“..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Ја конфигурирам мобилната широкопојасна врска „%s“..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Потребна е автентикација на корисникот за мобилната широкопојасна врска "
 "„%s“..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Мобилната широкопојасна врска „%s“ е активна"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Автоматски етернет"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Жичени мрежи (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Мрежа (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Жичени мрежи"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Жичена мрежа"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Сега сте поврзани со жичената мрежа."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Ја подготвувам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Ја конфигурирам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Потребна е автентикација на корисник за безжичната мрежа „%s“..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Барам адреса за жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Жичената мрежна врска %s е активна"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL автентикација"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Поврзи се со скриена безжична мрежа"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Креирај нова безжична мрежа"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ништо)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Не можев да ја уредам новата врска"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Жичени мрежи (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
@@ -741,247 +776,261 @@ msgstr[0] "Жичена мрежа"
 msgstr[1] "Жичена мрежа"
 msgstr[2] "Жичена мрежа"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX е оневозможен"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX е оневозможен од хардверски прекинувач"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Повеќе мрежи"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Достапни безични мрежи"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Користете го менито за мрежи за да се поврзите на безжична мрежа"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Сега сте поврзани со безжичната мрежа %s."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Ја подготвувам мрежата врска „%s“..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Ја конфигурирам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Потребна е автентикација на корисникот за безжичната мрежа „%s“..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Барам мрежна адреса за „%s“..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Безжичната мрежна врска „%s“ е активна: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Жичената мрежна врска %s е активна"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Не успеав да креирам PAN врска: %s"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Грешка во прикажувањето на информациите за поврзувањето:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамичен WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Адреси"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ништо"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (стандардно)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP Адреса"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Адреса за емитување"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Мрежна маска"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Примарен DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Секундарен DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Тернарен DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Етернет (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Општо"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Уред"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Хардверска адреса"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драјвер"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Брзина"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Безбедност:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Стандардна насока"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Игнорирано"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Тип на VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN премин"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Корисничко име за VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN банер"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Основна врска"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Не се пронајдени валидни врски!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -989,17 +1038,21 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "и многу други придонесувачи од заедницата и преведувачи"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет во местото за известување за менаџирање на мрежните уреди и поврзувања."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Веб сајтот на NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Јован Наумовски"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1007,33 +1060,33 @@ msgstr ""
 "Аплетот за NetworkManager не може да најде некои од потребните ресурси (не е "
 "пронајдена .ui датотеката)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Недостастуваат ресурси"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Лозинка за широкопојасна мобилна мрежа"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Потребна е лозинка за поврзување со „%s“."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Потребно е отклучување со PIN за SIM картичката"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Потребно е отклучување со PIN за SIM картичката"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1043,25 +1096,25 @@ msgstr ""
 "користи."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Покажи го PIN кодот"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Потребно е отклучување на SIM картичката со PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Потребно е отклучување на SIM картичката со PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1071,35 +1124,42 @@ msgstr ""
 "користи."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Нов PIN код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Повторно внесете го новиот PIN код:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Покажи ги 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Информации за поврзувањето"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Не успеав да креирам DUN врска: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1108,42 +1168,42 @@ msgstr ""
 "IP адресата го идентификува Вашиот компјутер на мрежата. Кликнете на копчето "
 "„Додај“ за да додадете IP адреса."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Избриши"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Иг_норирај ги автоматски добиените рути"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Користи ја оваа в_рска само за ресурси на нејзината мрежа"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1151,17 +1211,17 @@ msgstr ""
 "Ако е овозможено, оваа врска никогаш нема да се користи како стандардната "
 "мрежна врска."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Креирај..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Изберете тип на VPN поврзување"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1173,213 +1233,272 @@ msgstr ""
 "VPN врска која сакате да ја креирате не се појавува во листата, можно е да "
 "го немате инсталирано точниот VPN приклучок."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Сервис:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Адреса за емитување:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Основна врска:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "Р_ежим:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Уред:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Примарен DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "бајти"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_Безбедност:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Основна врска:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Овозможи _вмрежување"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматски"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "стандарндо"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1390,439 +1509,530 @@ msgstr ""
 "мрежниот уред на кој е активирана оваа врска. Оваа опција се нарекува и "
 "клонирање на MAC адреси.  Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Хардверска адреса:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Било кој уред"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Не успеав да ги ажурирам информациите за најава поради непозната грешка."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Користи 802.1X за безбедност на оваа врска"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Корисничко име:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Сервис:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "П_окажи лозинка"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Лозинка:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Уред"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Уред:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Уред:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматски"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Бакарна парица (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Игнорирај"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Рачно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "_Порта:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Сервис:"
+msgid "_Port"
+msgstr "_Порта:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Клонирана MAC адреса:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Лозинка на _приватниот клуч:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Стандардно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Игнорирај"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Адреса за емитување:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Лозинка на _приватниот клуч:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Брзина:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ништо"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Сега сте поврзани со жичената мрежа."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Автоматски отклучи го овој уред"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Информации за поврзувањето"
+msgid "_Metered connection"
+msgstr "Основна врска:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Врзувај се _автоматски"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1831,7 +2041,7 @@ msgstr ""
 "IP адресата го идентификува Вашиот компјутер на мрежата. Кликнете на копчето "
 "„Додај“ за да додадете IP адреса."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1839,128 +2049,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Автоматски, само адреси"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "В_рзи се"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Сервис:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Етернет (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматски со рачни DNS поставувања"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Споделено со други копмјутери"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Метод:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1971,8 +2184,8 @@ msgstr ""
 "мрежата да ја прилагодува конфигурацијата на Вашиот компјутер. Ако сакате да "
 "користите идентификатор за DHCP клиент, внесете го овде."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1980,26 +2193,26 @@ msgstr ""
 "Домените кои се користат за разрешување на имиња на хостови. Користете "
 "запирки за да разделите повеќе домени."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID на клиент за D_HCP:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "_Домени за пребарување:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS сервери:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2008,12 +2221,12 @@ msgstr ""
 "на имиња на хостови. Користете запирки за да разделите повеќе адреси на "
 "сервери за имиња на домени."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Барај IPv4 адресирање за да се оствари оваа врска"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2021,25 +2234,34 @@ msgstr ""
 "При поврзување со мрежи кои поддржуваат IPv6, дозволува врската да се "
 "оствари ако конфигурацијата за IPv4 не успее, но таа за IPv6 успее."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Рути..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Оневозможено"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2050,16 +2272,20 @@ msgstr ""
 "на имиња на хостови. Користете запирки за да разделите повеќе адреси на "
 "сервери за имиња на домени."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Барај IPv6 адресирање за да се оствари оваа врска"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2067,758 +2293,859 @@ msgstr ""
 "При поврзување со мрежи кои поддржуваат IPv4, дозволува врската да се "
 "оствари ако конфигурацијата за IPv6 не успее, но таа за IPv4 успее."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Метрика"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Увези"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Основно"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Бр_ој:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Напредно"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID на мр_ежа:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Промени..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Дозволи роминг, ако домашната мрежа не е достапна"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Покажи ги лозин_ките"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Автентикација"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Дозволени методи:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Конфигурација на _методи…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Компресија"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Користи енкрипција за точка-до-точка (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Барај 128-bit енкрипција"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Користи _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Дозволи _BSD компресија на податоци"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Дозволи _Deflate компресија на податоци"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Користи компресија на TCP _заглавијата"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Испрати PPP _echo пакети"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Метод:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ништо"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Метод:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Напредно"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Жичени мрежи"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Безбедност:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Безбедност:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Безбедност:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Приватен _клуч:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_Рачна конфигурација"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "_Рачна конфигурација"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Безбедност:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Етернет (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Основна врска:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Автоматски етернет"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Хардверска адреса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Хардверска адреса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Безбедност:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Јачина на емит_ување:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Јачина на емит_ување:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Уред:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Уред:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Клонирана MAC адреса:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Безбедност:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Јачина на емит_ување:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Брзина:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "К_анал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Опсе_г:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Дозволени методи на автентикација"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Протокол за автентикација на лозинки"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge handshake протокол за автентикација"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 "Протокол за автентикација „Microsoft Challenge Handshake Authentication "
 "Protocol“"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Протокол за автентикација „Microsoft Challenge Handshake Authentication "
 "Protocol“ верзија 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2828,112 +3155,100 @@ msgstr ""
 "автентикација. Ако врската не успее, пробајте да оневозможите некои од "
 "методите."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Додатокот за VPN не успеа правилно да ја увези VPN врската\n"
-"\n"
-"Грешка: нема тип на VPN сервис."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Не можам да увезам VPN поврзување"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"The file '%s' could not be read or does not contain recognized VPN "
-"connection information\n"
+"Додатокот за VPN не успеа правилно да ја увези VPN врската\n"
 "\n"
-"Error: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Непознато"
+"Грешка: нема тип на VPN сервис."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Одберете датотека за увезување"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Хардверска адреса:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Извези VPN врска..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2941,79 +3256,86 @@ msgstr ""
 "Дијалогот за уредување на врски не можеше да се иницијализира поради "
 "непозната грешка."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не можев да креирам нова врска"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Бришењето на врската не успеа"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Дали сте сигурни дека сакате да ја избришете врската %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN поврзувања"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Нет маска"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Премин"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Уредувам %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Ја уредувам неименуваната врска"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Име на _врска:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Грешка при иницијализацијата на врската"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Додавањето на врска не успеа"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3021,104 +3343,102 @@ msgstr ""
 "Уредувачот на врски не можеше да најди некои од потребните ресурси (.ui "
 "датотеката не беше пронајдена)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Зачувај"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Зачувај ги сите промени направени на оваа врска."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Автентицирајте се за да се зачува оваа врска за сите корисници на оваа "
 "машина."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Не можев да креирам нова врска"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не можев да ја уредам врската"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Грешка при креирањето на дијалогот за врски."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Грешка при иницијализацијата на врската"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Додавањето на врска не успеа"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Име на _врска:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "И_звези"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "никогаш"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "сега"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3126,7 +3446,7 @@ msgstr[0] "пред %d минута"
 msgstr[1] "пред %d минути"
 msgstr[2] "пред %d минути"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3134,7 +3454,7 @@ msgstr[0] "пред %d час"
 msgstr[1] "пред %d часа"
 msgstr[2] "пред %d часа"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3142,7 +3462,7 @@ msgstr[0] "пред %d ден"
 msgstr[1] "пред %d дена"
 msgstr[2] "пред %d дена"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3150,7 +3470,7 @@ msgstr[0] "пред %d месец"
 msgstr[1] "пред %d месеци"
 msgstr[2] "пред %d месеци"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3158,126 +3478,171 @@ msgstr[0] "пред %d година"
 msgstr[1] "пред %d години"
 msgstr[2] "пред %d години"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Додавањето на врска не успеа"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Жичена врска %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Жичена врска %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Име"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Последно користена"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Уреди ја избраната врска"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Автентицирајте се за да ја уредите избраната врска"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Избриши ја избраната врска"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Автентицирајте се за да ја избришите избраната врска"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Неподдржан тип на широкопојасна мобилна врска."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Не знам како да креирам врски за „%s“"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Грешка при уредувањето на врската"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Грешка при креирањето на врската"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Додавањето на врска не успеа"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Не знам како да креирам врски за „%s“"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Грешка при уредувањето на врската"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Не најдов врска со UUID „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Мрежни врски"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Додај ново VPN поврзување"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X безбедност"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за безбедност на Wi-Fi."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Користи 802.1X за безбедност на оваа врска"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "не можев да пронајдам Bluetooth уред."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Овозможи _вмрежување"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Безжична мрежа"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Примарен DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Жичена врска %d"
@@ -3285,34 +3650,39 @@ msgstr "Жичена врска %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Уред:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL врска %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3322,57 +3692,56 @@ msgstr ""
 "Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна "
 "MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Игнорирано"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Етернет (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Клонирана MAC адреса:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Жичена врска %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Стандардно"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3383,188 +3752,190 @@ msgstr ""
 "Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна "
 "MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за Wi-Fi."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Автоматски (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Само автоматски (VPN) адреси"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Автоматски, само адреси"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Автоматски (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Само автоматски (PPPoE) адреси"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Автоматски (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Само автоматски (DHCP) адреси"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Само Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_DNS сервери:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_Домени за пребарување:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Уредување на IPv4 рутите за %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Поставувања за IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Автоматски, само DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Уредување на IPv6 рутите за %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Поставувања за IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за DSL."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL врска %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Не можев да го вчитам корисничкиот интерфејс за широкопојасен мобилен "
 "пристап."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Неподдржан тип на широкопојасна мобилна врска."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изберете тип на оператор за мобилен широкопојасен пристап"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3574,7 +3945,7 @@ msgstr ""
 "користи Вашиот оператор. Ако не сте сигурни која технологија се користи, "
 "прашајте го операторот."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Мојот оператор користи _GSM базирана технологија (пр.. GPRS, EDGE, UMTS, "
@@ -3582,84 +3953,80 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мојот оператор користи C_DMA базирана технологија (пр.. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ништо"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Ги уредува PPP методите за автентикација за %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Поставувања за PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Жичена врска %d"
@@ -3667,11 +4034,11 @@ msgstr "Жичена врска %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
@@ -3679,59 +4046,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Нема мрежна врска"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv4."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN врска %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Не можев да го вчитам корисничкиот интерфејс за VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Не можев да најдам сервис од додаток за VPN за „%s“."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не можев да најдам сервис од додаток за VPN за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Додавањето на врска не успеа"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Не можев да најдам сервис од додаток за VPN за „%s“."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN врска %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Изберете тип на VPN поврзување"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3742,7 +4109,7 @@ msgstr ""
 "VPN врска која сакате да ја креирате не се појавува во листата, можно е да "
 "го немате инсталирано точниот VPN приклучок."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3751,7 +4118,7 @@ msgstr ""
 "Оваа опција ја заклучува врската на мрежната пристапна точка (AP) одредена "
 "со BSSID кое е внесено тука.  Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3761,100 +4128,98 @@ msgstr ""
 "Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна "
 "MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Било кој уред"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit клуч (Хексадецимален или ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не можев да го вчитам корисничкиот интерфејс за безбедност на Wi-Fi. "
 "Недостасува поставувањето за Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Безжична безбедност"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за безбедност на Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Веќе постои датотека со име „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Дали сакате да ја замените %s со VPN врската која ја зачувувате?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не можев да ја извезам VPN врската"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3865,223 +4230,106 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Извези VPN врска..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Отклучи"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Автоматски отклучи го овој уред"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Информации за поврзувањето"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Активни мрежни врски"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Сертификат на C_A:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Изберете личен сертификат..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Приватен _клуч:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Лозинка на _приватниот клуч:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Изберете личен сертификат..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Кориснички сертификат:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Вашата мобилна широкопојасна врска е конфигурирана со следните поставувања:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Вашиот уред:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Вашиот оператор:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Вашата тарифа:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Сега ќе биде остварена мобилна широкопојасна врска со вашиот оператор со "
-"користење на поставувањата кои ги избравте.  Ако врската не успее или не "
-"можете да пристапите на мрежните ресурси, повторно проверете ги "
-"поставувањата.  За да ги измените поставувањата за мобилната широкопојасна "
-"врска изберете „Мрежни врск“ од менито Систем >> Преференци."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Потврдете ги поставувањата за мобилна широкопојасна врска"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Мојата земја не е во листата"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не е во листата"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Изберете ја Вашата тарифа:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Изберете го Вашиот _APN (име на пристапна точка):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Предупредување: со избирање на неточна тарифа може да предизвика неправилна "
-"наплата за сметката за широкопојасен пристап или да ја спречи врската.\n"
-"\n"
-"Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот оператор "
-"да ви го APN за Вашата тарифа."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Изберете ја Вашата тарифа"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мојата тарифа не е во листата..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Изберете го Вашиот оператор од _листата:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Оператор"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Оператор:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Мојот оператор користи GSM технологија (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Мојот оператор користи CDMA технологија (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Изберете го Вашиот оператор"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Листа на држави и региони:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Држава или регион"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Мојата земја не е во листата"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Изберете ја земјата на Вашиот оператор"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталиран GSM уред"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталиран CDMA уред"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Било кој уред"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна широкопојасна врска"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4089,191 +4337,271 @@ msgstr ""
 "Овој помошник Ви помага лесно да ја поставите врската за мобилен интернет на "
 "мобилна (3G) мрежа."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Ви требаат следните податоци:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Името на Вашиот оператор за широкопојасна врска"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Името на тарифата"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(во некои случаеви) Вашето APN за тарифата која ја користите"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Креирај врска за  _овој уред за мобилен широкопојасен пристап:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Било кој уред"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Поставете мобилна широкопојасна врска"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Нова мобилна широкопојасна врска"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Држава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изберете ја земјата на Вашиот оператор"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Изберете го Вашиот оператор од _листата:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мојот оператор користи GSM технологија (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мојот оператор користи CDMA технологија (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Изберете го Вашиот оператор"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Изберете ја Вашата тарифа:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Изберете го Вашиот _APN (име на пристапна точка):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Предупредување: со избирање на неточна тарифа може да предизвика неправилна "
+"наплата за сметката за широкопојасен пристап или да ја спречи врската.\n"
+"\n"
+"Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот оператор "
+"да ви го APN за Вашата тарифа."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Изберете ја Вашата тарифа"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Вашата мобилна широкопојасна врска е конфигурирана со следните поставувања:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Вашиот уред:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Вашиот оператор:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Вашата тарифа:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Сега ќе биде остварена мобилна широкопојасна врска со вашиот оператор со "
+"користење на поставувањата кои ги избравте.  Ако врската не успее или не "
+"можете да пристапите на мрежните ресурси, повторно проверете ги "
+"поставувањата.  За да ги измените поставувањата за мобилната широкопојасна "
+"врска изберете „Мрежни врск“ од менито Систем >> Преференци."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потврдете ги поставувањата за мобилна широкопојасна врска"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ништо)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Сертификат на C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Непознато"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Изберете датотека"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Изберете датотека"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Изберете личен сертификат..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Кориснички сертификат:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Грешка при уредувањето на врската"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Отклучи"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Ба_рај ја оваа лозинка секогаш"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Потребна е лозинка за поврзување со „%s“."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Лозинка:"
+msgid "Sh_ow passwords"
+msgstr "Покажи ги лозин_ките"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Лозинка:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "Покажи ги лозин_ките"
+msgid "_Secondary Password:"
+msgstr "_Лозинка:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Лозинка:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Исклучи се"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништо"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамичен WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "К_реирај"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4281,42 +4609,42 @@ msgstr ""
 "За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или "
 "лозинка '%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребна е автентикација за безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Потребна е автентикација за безжичната мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Креирај нова безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Внесете име на безжичната мрежа на која што сакате да се врзете."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Поврзи се со скриена безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Скриена безжична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4325,37 +4653,55 @@ msgstr ""
 "Внесете име и безбедносни податоци за безжичната мрежа на која што сакате да "
 "се врзете."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Безжична безбедност:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Вр_ска:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Безжичен _адаптер:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Не можам да го најдам мојот оператор и сакам да го внесам _рачно:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Оператор:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Листа на држави и региони:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Држава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Жичено"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4365,17 +4711,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Безжична безбедност:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Име на _мрежа:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Вр_ска:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Безжичен _адаптер:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Искористеност:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4383,7 +4753,7 @@ msgstr ""
 "Оваа програма е дел од NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4391,420 +4761,470 @@ msgstr ""
 "Не е наменета за користење преку командната линија, туку да се извршува во "
 "работната околина GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "не е овозможено"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не е регистрано"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Домашна мрежа"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "барам"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрацијата не успеа"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s роминг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Мрежа во роаминг (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Мрежа за роминг"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN код за SIM картичката „%s“ на „%s“"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Потребен е PIN код"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Потребен е PIN код за мобилниот широкопојасен уред"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Мобилната широкопојасна врска „%s“ е активна: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "CDMA врска"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Сертификати за DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Приватни клучеви за DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Сертификат на C_A:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Анони_мен идентитет:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Автентикација"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Анони_мен идентитет:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "В_натрешна автентикација:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Изберете сертификат од авторитетот за сертификати..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Верзија 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Сертификат на C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Сертификат на C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "Верзија на _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit фраза за лозинка"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Покажи ја фразата за лозинка"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертификат на C_A:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Сертификат на C_A:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "И_дентитет:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Тунелиран TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Заштитен EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "_Автентикација:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (стандардно)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Open System"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Споделен клуч"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (стандардно)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Клуч:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Пок_ажи го клучот"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP инде_кс:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Тип:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (стандардно)"
+
+#~ msgid "Ignored"
+#~ msgstr "Игнорирано"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Не успеав да ги ажурирам информациите за најава поради непозната грешка."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Информации за поврзувањето"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Не можам да увезам VPN поврзување"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "The file '%s' could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Непознато"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Активни мрежни врски"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Изберете сертификат од авторитетот за сертификати..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Сертификат на C_A:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Аплет за менаџирање со мрежи"
 
@@ -4840,15 +5260,6 @@ msgstr "_Тип:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Автоматски преговори"
 
@@ -4962,13 +5373,6 @@ msgstr "_Тип:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Секундарен DNS:"
-
-#~| msgid "Secondary DNS:"
-#~ msgid "Ternary DNS:"
-#~ msgstr "Тернарен DNS:"
-
 #~| msgid "Mobile Broadband"
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Овозможи WiMAX мобилна широкопојасна _врска"
@@ -5029,13 +5433,6 @@ msgstr "_Тип:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Достапна за сите корисници"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Врзувај се _автоматски"
-
-#~| msgid "E_xport"
-#~ msgid "_Import"
-#~ msgstr "_Увези"
-
 #~| msgid "Error displaying connection information:"
 #~ msgid "Error saving connection"
 #~ msgstr "Грешка при зачувувањето на врската"
@@ -5074,10 +5471,6 @@ msgstr "_Тип:"
 #~ msgid "Error: %s"
 #~ msgstr "Грешка: %s"
 
-#~| msgid "Finished Create VPN Connection"
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Не успеав да креирам DUN врска: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "Помошникот за мобилни беше прекинат"
 
@@ -5190,9 +5583,6 @@ msgstr "_Тип:"
 #~ "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните "
 #~ "ресурси (не е пронајдена glade датотеката)!"
 
-#~ msgid "translator-credits"
-#~ msgstr "Јован Наумовски"
-
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
@@ -5212,9 +5602,6 @@ msgstr "_Тип:"
 #~ msgid "Passphrase:"
 #~ msgstr "Фраза за лозинка:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Покажи ја фразата за лозинка"
-
 #~ msgid "alert text"
 #~ msgstr "текст за известување"
 
diff --git a/po/ml.po b/po/ml.po
index ea9f769d..dbe650ce 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master.ml\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-04-21 23:43+0530\n"
 "Last-Translator: Balasankar C <c.balasankar@gmail.com>\n"
 "Language-Team: Swatantra Malayalam Computing\n"
@@ -21,48 +22,57 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "ശൃംഖല"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ കൈകാര്യം ചെയ്യുക"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "ശൃംഖല ബന്ധങ്ങള്‍"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "സജീവ ശൃംഖല ബന്ധങ്ങള്‍"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "നിങ്ങളുടെ ശൃംഖല ബന്ധങ്ങള്‍ സജ്ജീകരണങ്ങള്‍ കൈകാര്യം ചെയ്യുകയും മാറ്റങ്ങള്‍ വരുത്തുകയും ചെയ്യുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "ബന്ധപ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "ഒരു ശൃംഖലയുമായി ബന്ധപ്പെടുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "ബന്ധം വേര്‍പ്പെടുമ്പോളുള്ള അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "ഒരു ശൃംഖലയില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് "
 "true ആക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "വിപിഎന്‍ അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -70,48 +80,49 @@ msgstr ""
 "ഒരു വിപിഎനില്‍ നിന്നും ബന്ധം വിഛേദിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ തയ്യാറാക്കുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന "
 "രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ശൃംഖലകള്‍ ലഭ്യമാണെന്ന അറിയിപ്പ് കാണിയ്ക്കേണ്ട"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "വയര്‍ലെസ് ശൃംഖലകള്‍ ലഭ്യമാകുമ്പോള്‍, അറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "സ്റ്റാമ്പ്"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "സജ്ജീകരണങ്ങള്‍ പുതിയ പതിപ്പില്‍ നീക്കേണ്ടതുണ്ടോ എന്നു് നിശ്ചയിക്കുന്നതിനായി ഉപയോഗിക്കുന്നു."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "വൈഫൈ ഉണ്ടാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "ലഘുപ്രയോഗം ഉപയോഗിച്ചു് അഡ്ഹോക് ശൃംഖലകള്‍ തയ്യാറാക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true "
 "ആക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "ലഘുപ്രയോഗം അറിയിപ്പുകളുടെ സ്ഥാനത്ത് കാണിക്കാതിരിക്കാൻ FALSE എന്ന് ആക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് വേണ്ടെന്നു്വയ്ക്കുക"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -119,7 +130,7 @@ msgstr ""
 "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന "
 "രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -127,130 +138,143 @@ msgstr ""
 "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിന്റെ രണ്ടാം ഘട്ടത്തിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള "
 "മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "ശൃംഖല മാനേജര്‍"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "ശൃംഖല ബന്ധം ലഭ്യമല്ല"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager ലഘുപ്രയോഗം"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_കണക്ട് ചെയ്യുക"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_ശൃംഖലയുടെ പേരു്:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "അഡ്-ഹോക്"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "ഒരു ബന്ധം ചേര്‍ക്കാന്‍/സജീവമാക്കാന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "അറിയാത്ത ഏതോ പ്രശ്നം"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "ബന്ധമായില്ല"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ഉപകരണം വേര്‍പ്പെടുത്താന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "വേര്‍പ്പെടുത്താന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "ബന്ധം സജീവമാക്കാന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ഈ സന്ദേശം ഇനി കാണിക്കരുതു്"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ കണക്ഷനില്‍ തടസ്സം നേരിട്ടതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' വിഛേദിക്കപ്പെട്ടു."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -270,7 +294,7 @@ msgstr ""
 "\n"
 "ശൃംഖല കണക്ഷനില്‍ തടസ്സം നേരിട്ടതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സര്‍വീസ് അപ്രതീക്ഷിതമായി നിലച്ചതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -289,7 +313,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സേവനം തെറ്റായ ക്രമീകരമാണെന്നറിയിച്ചതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "ബന്ധപ്പെടാനനുവദിച്ച സമയം കഴിഞ്ഞുപോയതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "വിപിഎന്‍ സേവനം ശരിയായ സമയത്തു് ആരംഭിക്കുവാന്‍ സാധ്യമാകാത്തതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' "
 "പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സേവനം ആരംഭിക്കുന്നതിലുള്ള തടസ്സം കാരണം വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "സാധുവായ വിപിഎന്‍ രഹസ്യങ്ങള്‍ ലഭ്യമല്ലാത്തതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "അസാധുവായ വിപിഎന്‍ രഹസ്യങ്ങള്‍ കാരണം വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -355,19 +379,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "വിപിഎന്‍ കണക്ഷന്‍ വിജയകരമായി സ്ഥാപിച്ചിരിയ്ക്കുന്നു.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "വിപിഎന്‍ ലോഗിന്‍ സന്ദേശം"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "വിപിഎന്‍ ബന്ധം പരാജയപ്പെട്ടു"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -380,7 +404,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -393,583 +417,612 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ഉപകരണം തയ്യാറല്ല (ഫേംവെയര്‍ ഇല്ല)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ഉപകരണം തയ്യാറല്ല"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ബന്ധം വിഛേദിച്ചിരിയ്ക്കുന്നു"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ബന്ധം വിഛേദിക്കുക"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ഉപകരണം കൈകാര്യം ചെയ്യാത്തതാണു്"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ശൃംഖല ഉപകരണങ്ങളൊന്നും ലഭ്യമല്ല"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_വിപിഎന്‍ ബന്ധങ്ങള്‍"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "വിപി_എന്‍ ക്രമീകരിക്കുക..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_വിപിഎന്‍ ബന്ധങ്ങള്‍"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager പ്രവര്‍ത്തനത്തിലില്ല..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ശൃംഖല ബന്ധം പ്രവര്‍ത്ത രഹിതമാക്കിയിരിക്കുന്നു"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_ശൃംഖല ബന്ധം സജ്ജമാക്കുക"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജമാക്കുക"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "അറിയിപ്പു_കള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "ബന്ധ _വിവരം"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "ബന്ധങ്ങള്‍ ചിട്ടപ്പെടുത്തുക..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_അണിയറ വിശേഷം"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ '%s'-മായി ബന്ധപ്പെട്ടിരിക്കുന്നു."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ബന്ധംവിഛേദിച്ചിരിക്കുന്നു"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ശൃംഖല ബന്ധം വിഛേദിച്ചിരിക്കുന്നു."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ശൃംഖല ബന്ധം '%s'-നായി തയ്യാറെടുക്കുന്നു..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 "ശൃംഖല ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s'-നു് ഒരു ശൃംഖല വിലാസത്തിനായി ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "വിപിഎന്‍ ബന്ധം '%s' ആരംഭിക്കുന്നു..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 "വിപിഎന്‍ ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s'-നായി ഒരു വിപിഎന്‍ വിലാസം ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "വിപിഎന്‍ ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ശൃംഖല ബന്ധം ലഭ്യമല്ല"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ലഘുപ്രയോഗം"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "തെറ്റായ പിയുകെ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "തെറ്റായ പിന്‍ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "പൂട്ട് തുറക്കേണ്ട കോഡ് അയയ്ക്കുന്നു..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ലഭ്യമായവ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "ബന്ധം സ്ഥാപിച്ചു"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ മൊബെല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖല."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വീട്ടിലെ ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ പുറത്തൊരു ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ മൊബെല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s'-നായി തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' ക്രമീകരിക്കുന്നു..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി "
 "ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ഓട്ടോ ഇതര്‍നെറ്റ്"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "എതര്‍നെറ്റ് ശൃംഖലകള്‍ (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "എതര്‍നെറ്റ് ശൃംഖല (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "എതര്‍നെറ്റ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "എതര്‍നെറ്റ് ശൃംഖല"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ എഥര്‍നെറ്റ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' ക്രമീകരിയ്ക്കുന്നു..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "എഥര്‍നെറ്റ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s'-നുള്ള ഒരു എഥര്‍നെറ്റ് ശൃംഖല വിലാസം ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ഡിഎസ്എല്‍ ആധികാരികത ഉറപ്പാക്കല്‍"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ഒന്നുമില്ല)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "പുതിയ ബന്ധം ചേര്‍ക്കാനായില്ല"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "വയര്‍ലെസ് ശൃംഖലകള്‍ (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "വയര്‍ലെസ് ശൃംഖല (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "വയര്‍ലെസ് ശൃംഖല"
 msgstr[1] "വയര്‍ലെസ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "വയര്‍ലസ്സ് പ്രവര്‍ത്തനരഹിതമാക്കിയിരിയ്ക്കുന്നു"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "ഹാര്‍ഡ്‌​വെയര്‍ സ്വിച്ച് ഉപയോഗിച്ച് വയര്‍ലെസ്സ് പ്രവര്‍ത്തന രഹിതമാക്കിയിരിക്കുന്നു"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "കൂടുതല്‍ ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "ലഭ്യമായ വയര്‍ലെസ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ശൃംഖലകളുടെ പട്ടികയുപയോഗിച്ചു് ഒരു വയര്‍ലെസ് ശൃംഖലയുമായി ബന്ധപ്പെടുക"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വയര്‍ലെസ് ശൃംഖല '%s'-മായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "വയര്‍ഡ് ശൃംഖല ബന്ധം '%s' തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' ക്രമീകരിക്കുന്നു..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "വയര്‍ലെസ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s'-നുള്ള ഒരു വയര്‍ലെസ് ശൃംഖല വിലാസത്തിനായി ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "ബന്ധം സജീവമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "ബന്ധം സംബന്ധിച്ചുള്ള വിവരം കാണിക്കുന്നതില്‍ പിശക്"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "എല്‍ഇഎപി"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ഡൈനമിക് ഡബ്ലിയുഇപി"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "ഡബ്ലിയുപിഎ/ഡബ്ലിയുപിഎ2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "വിലാസങ്ങള്‍"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "ഡബ്ലിയുഇപി"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (സഹജം)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "അറിയില്ല"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "അറിയില്ല"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "ഐപി വിലാസം"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ബ്രോഡ്കാസ്റ്റ് വിലാസം"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "അറിയില്ല"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "സബ്‌നെറ്റ് മാസ്ക്"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "രണ്ടാമത്തെ ഡിഎന്‍എസ്:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "മൂന്നാമത്തെ ഡിഎന്‍എസ്:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ഇതര്‍നെറ്റ് (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 വൈഫൈ (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "ജിഎസ്എം (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "സിഡിഎംഎ (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "പൊതുവായ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "വിനിമയതലം"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍ വിലാസം"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ഡ്രൈവര്‍"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "വേഗത"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "സുരക്ഷ:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "സഹജമായ റൂട്ട്"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "അവഗണിക്കപ്പെട്ടവ"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "അടയാളവാക്ക്:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "വിപിഎന്‍ തരം"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "വിപിഎന്‍ ഗേറ്റ്‌വേ"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "വിപിഎന്‍ ഉപയോക്തൃനാമം"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "വിപിഎന്‍ ബാനര്‍"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "അടിസ്ഥാന ബന്ധം"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "അപരിചിതം"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "സാധുവായ സജീവ ബന്ധങ്ങളൊന്നും കണ്ടില്ല!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "പകര്‍പ്പവകാശം © 2004-2008 റെഡ് ഹാറ്റ്, ഇന്‍ക്.\n"
 "പകര്‍പ്പവകാശം © 2005-2008 നോവല്‍, ഇന്‍ക്."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "നിങ്ങളുടെ ശൃംഖല ഉപകരണങ്ങളും ബന്ധങ്ങളും കൈകാര്യം ചെയ്യുന്നതിനായുള്ള അറിയിപ്പിനുള്ള സ്ഥലം."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager വെബ്സൈറ്റ്"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -977,33 +1030,33 @@ msgstr ""
 "ആവശ്യമുള്ള ചില ഉറവിടങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ NetworkManager ആപ്ലെറ്റിനു് സാധ്യമായില്ല (.uiഫയല്‍ "
 "ലഭ്യമായില്ല)"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ലഭ്യമല്ലാത്ത റിസോഴ്സുകള്‍"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് നെറ്റ്‌വര്‍ക്കിനുള്ള അടയാളവാക്ക്"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'-ലേക്കു് ബന്ധപ്പെടുന്നതിനായി ഒരു അടയാളവാക്ക് ആവശ്യമുണ്ടു്."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "അടയാളവാക്ക്:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "സിം പിന്‍ കൊടുത്തു് തുറക്കണം"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "സിം പിന്‍ കൊടുത്തു് തുറക്കണം"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1011,25 +1064,25 @@ msgid ""
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഉപകരണം '%s' ഉപയോഗിക്കുന്നതിനു് മുമ്പ് ഒരു സിം പിന്‍ കോഡ് ആവശ്യമുണ്ടു്."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "പിന്‍ കോഡ്:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "പിന്‍ കോഡ് കാണിയ്ക്കുക"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "സിം പിയുകെ കൊടുത്തു് തുറക്കണം"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "സിം പിയുകെ കൊടുത്തു് തുറക്കണം"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1037,35 +1090,42 @@ msgid ""
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഉപകരണം '%s' ഉപയോഗിക്കുന്നതിനു് മുമ്പ് ഒരു സിം പിയുകെ കോഡ് ആവശ്യമുണ്ടു്."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "പിയുകെ കോഡ്:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "പുതിയ പിന്‍ കോഡ്:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "പുതിയ പിന്‍ കോഡ് വീണ്ടും നല്‍കുക:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "പിന്‍/പിഒകെ കോഡുകള്‍ കാണിയ്ക്കുക"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ബന്ധവിവരം"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "ഡിയുഎന്‍ കണക്ഷനുണ്ടാക്കുന്നതില്‍ പരാജയം: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1074,56 +1134,56 @@ msgstr ""
 "നിങ്ങളുടെ കമ്പ്യൂട്ടറിനെ ശൃംഖലയില്‍ തിരിച്ചറിയുന്നതു്  ഐപി വിലാസങ്ങള്‍ വഴിയാണു്. ഒരു ഐപി വിലാസം "
 "ചേര്‍ക്കുന്നതിനായി \"ചേര്‍ക്കുക\" എന്ന ബട്ടണില്‍ ക്ലിക്ക് ചെയ്യുക."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_നീക്കം ചെയ്യുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "സ്വയം ലഭിച്ച റൂട്ടുകള്‍ അവ_ഗണിക്കുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "ഈ _ബന്ധത്തിന്റെ ശൃംഖലയിലുള്ള വസ്തുക്കള്‍ക്കു് മാത്രം ഉപയോഗിയ്ക്കുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "സജ്ജമെങ്കില്‍, ഈ ബന്ധം ഒരിക്കലും സഹജമായി ശൃംഖല ബന്ധമായി ഉപയോഗിക്കുവാന്‍ സാധ്യമല്ല."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "ഉണ്ടാക്കുക"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "ഒരു ബന്ധ രീതി തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1135,209 +1195,284 @@ msgstr ""
 "വിപിഎന്‍ ആണ് ഉണ്ടാക്കുന്നതെങ്കില്‍, നിങ്ങള്‍ക്കു് ആവശ്യമുള്ളതു് പട്ടികയില്‍ ലഭ്യമല്ല എങ്കില്‍, നിങ്ങള്‍ "
 "ശരിയായ പ്ലഗിന്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്തിട്ടുണ്ടാവില്ല."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_സേവനം:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "റൌണ്ടു് റോബിന്‍"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "സജീവ ബാക്കപ്പ്"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "സംപ്രേക്ഷണം"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "തനിയെ ക്രമീകരിക്കുന്ന അയയ്ക്കല്‍ ലോഡ് ബാലന്‍സിങ്ങ്"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "തനിയെ ക്രമീകരിക്കുന്ന ലോഡ് ബാലന്‍സിങ്ങ്"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ശുപാര്‍ശ ചെയ്യുന്നത്)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "ബോണ്ടട് _ബന്ധങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_മോഡ്:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_ചിട്ട"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "നോക്കുന്ന _ഇടവേള:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "മില്ലി സെക്കന്റ്"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_ഇന്റര്‍ഫെയിസ് പേര്:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_കണ്ണി നോക്കുക:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _ലക്ഷ്യങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "കണ്ണിയുടെ അവസ്ഥ നോക്കുമ്പോള്‍ നോക്കേണ്ട ഐപി വിലാസമോ, കോമ കൊണ്ട് തിരിച്ച ഐപി വിലാസങ്ങള്‍."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "കണ്ണി _ഇപ് സമയം:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "കണ്ണി _ഡൌണ്‍ സമയം:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "_എംടിയു:"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "ബൈറ്റുകള്‍"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "വഴിയുടെ _വില:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_ഹെയര്‍പിന്‍ രീതി:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "ബ്രീഡ്ജ്ഡ് _ബന്ധങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_മുന്നോട്ടുള്ള സമയം:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_ഹലോ സമയം:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "സെക്കന്റ്"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_ശൃംഖല ബന്ധം സജ്ജമാക്കുക"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP സജ്ജമാക്കുക (സ്പാനിംഗ് ട്രീ നിയമം)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_പരമാവധി വയസ്സ്:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_വയസ്സാകുന്ന സമയം:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "സ്വയം"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "സ്വതവേയുള്ള"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1348,441 +1483,535 @@ msgstr ""
 "ഡിവൈസിനുള്ള ഹാര്‍ഡ്‌വെയര്‍ വിലാസമായി ഉപയോഗിയ്ക്കുന്നു. ഈ വിശേഷതയെ മാക് ക്ലോണിങ് അല്ലെങ്കില്‍ "
 "സ്പൂഫീങ് എന്നു് വിളിയ്ക്കുന്നു.  ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "വിലാസം"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "വിലാസം"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ഇന്റെര്‍ഫേസ് _നാമം:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍ വിലാസം:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ഏതെങ്കിലും ഡിവൈസ്"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "അപരിചിതമായ പിശക് കാരണം ബന്ധ രഹസ്യങ്ങള്‍ പരിഷ്കരിക്കുന്നതില്‍ പരാജയം."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ഈ കണക്ഷനുവേണ്ടി 802.1_X സുരക്ഷ ഉപയോഗിക്കുക"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_മുന്‍ഗണന: "
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_ഉപയോക്താവിന്റെ പേരു്:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_സേവനം:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "അടയാളവാക്ക് കാ_ണിക്കുക"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_അടയാളവാക്ക്:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "വിനിമയതലം"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_പാരന്‍റ്റ് ഇന്റെര്‍ഫേസ്:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_പാരന്‍റ്റ് ഇന്റെര്‍ഫേസ്:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "സ്വയം"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ട്വിസ്റ്റഡ് പെയര്‍ (ടിപി)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "അറ്റാച്ച്മെന്റ് യൂണിറ്റ് ഇന്റര്‍ഫേസ് (എയുഐ)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "ബിഎന്‍സി"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "മീഡിയ ഇന്‍ഡിപെന്‍ഡന്റ് ഇന്റര്‍ഫേസ് (എംഐഐ)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "അവഗണിക്കുക"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "നിങ്ങള്‍ നല്‍കിയ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_പോര്‍ട്ട്:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_സേവനം:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "തനിപ്പകര്‍പ്പെടുത്ത മാക് വിലാസം:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "സ്വതവേയുള്ള"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "അവഗണിക്കുക"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "സംപ്രേക്ഷണം"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_വേഗത:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "പൂര്‍ണ്ണമായും _ഡ്യൂപ്ലെക്സ്"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "ഈ ബന്ധം ഉപയോഗിക്കുമ്പോള്‍ _വിപിഎന്‍ തനിയെ ബന്ധിപ്പിക്കുക"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "ഉവ്വു്"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "ഇല്ല"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "എല്ലാ _ഉപയോക്താക്കള്‍ക്കും ഈ ശൃംഖലയിലേക്ക് ബന്ധിപ്പിക്കുക"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "ലഭ്യമാണെങ്കില്‍ ഈ ശൃംഖലയിലേക്ക് _തനിയെ ബന്ധിപ്പിക്കുക"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "ഈ ബന്ധം ഉപയോഗിക്കുമ്പോള്‍ _വിപിഎന്‍ തനിയെ ബന്ധിപ്പിക്കുക"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "ബന്ധ _വിവരം"
+msgid "Firewall _zone"
+msgstr "ഫയര്‍വാള്‍ _മേഖല:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "ബോണ്ടട് _ബന്ധങ്ങള്‍:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_സ്വയം കണക്ട് ചെയ്യുക"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "ഫയര്‍വാള്‍ _മേഖല:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1791,7 +2020,7 @@ msgstr ""
 "നിങ്ങളുടെ കമ്പ്യൂട്ടറിനെ ശൃംഖലയില്‍ തിരിച്ചറിയുന്നതു്  ഐപി വിലാസങ്ങള്‍ വഴിയാണു്. ഒരു ഐപി വിലാസം "
 "ചേര്‍ക്കുന്നതിനായി \"ചേര്‍ക്കുക\" എന്ന ബട്ടണില്‍ ക്ലിക്ക് ചെയ്യുക."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1799,128 +2028,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "ഓട്ടോമാറ്റിക് വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "വിലാസങ്ങള്‍"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_ട്രാന്‍സ്പോര്‍ട്ട് രീതി:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ഡാറ്റാഗ്രാം"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "ബന്ധപ്പെട്ടിരിക്കുന്നു"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_ട്രാന്‍സ്പോര്‍ട്ട് രീതി:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ഉപകരണത്തിന്റെ പേര് + സംഖ്യ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ഈഥര്‍നെറ്റ്"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "രീതി(_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_എംടിയു:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "നിങ്ങള്‍ നല്‍കിയ ഡിഎന്‍എസ് സജ്ജീകരണങ്ങളുപയോഗിച്ചു് സ്വയം"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ലിങ്ക്-ലോക്കല്‍"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "മറ്റു് കമ്പ്യൂട്ടറുകളുമായി പങ്കിടുന്നു"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_രീതി:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1931,8 +2164,8 @@ msgstr ""
 "ശൃംഖല ഭരണാധികാരിയെ അനുവദിക്കുന്നു. നിങ്ങള്‍ക്കു് ഒരു DHCP ക്ലയന്റ് ഐഡന്റിഫയര്‍ ഉപയോഗിക്കണമെങ്കില്‍, "
 "ഇവിടെ നല്‍കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1940,25 +2173,26 @@ msgstr ""
 "ഹോസ്റ്റ് നാമങ്ങള്‍ റിസോള്‍വ് ചെയ്യുമ്പോള്‍ ഉപയോഗിയ്ക്കുന്ന ഡൊമെയിനുകള്‍. ഡൊമെയിനുകള്‍ തമ്മില്‍ കോമാ "
 "ഉപയോഗിച്ചു് വേര്‍തിരിക്കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP ക്ലയന്റ് ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_തിരയേണ്ട ഡൊമെയിനുകള്‍:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_ഡിഎന്‍എസ് സെര്‍വറുകള്‍:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1966,11 +2200,11 @@ msgstr ""
 "ഹോസ്റ്റ് നാമങ്ങള്‍ റിസോള്‍വ് ചെയ്യുവാന്‍ ഉപയോഗിക്കുന്ന ഡൊമെയിന്‍ നെയിം സെര്‍വറുകളുടെ ഐപി വിലാസങ്ങള്‍. "
 "ഡൊമെയിന്‍ നെയിം സെര്‍വര്‍ വിലാസങ്ങള്‍ തമ്മില്‍ കോമാ ഉപയോഗിച്ചു് വേര്‍തിരിക്കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ഈ ബന്ധം പൂര്‍ത്തിയാക്കുന്നതിനായി IPv_4 അഡ്രസിങ് ആവശ്യമുണ്ടു്"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1978,25 +2212,35 @@ msgstr ""
 "IPv6-നുള്ള ശൃംഖലകളുമായി ബന്ധപ്പെടുമ്പോള്‍, IPv4 ക്രമീകരണം പരാജയപ്പെടുകയും IPv6 ക്രമീകരണം "
 "വിജയിക്കുകയും ചെയ്താല്‍ ബന്ധം പൂര്‍ത്തിയാക്കുവാന്‍ അനുവദിക്കുന്നു."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_റൂട്ടുകള്‍…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "പ്രവര്‍ത്തന രഹിതം"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2006,15 +2250,19 @@ msgstr ""
 "ഹോസ്റ്റ് നാമങ്ങള്‍ റിസോള്‍വ് ചെയ്യുവാന്‍ ഉപയോഗിക്കുന്ന ഡൊമെയിന്‍ നെയിം സെര്‍വറുകളുടെ ഐപി വിലാസങ്ങള്‍. "
 "ഡൊമെയിന്‍ നെയിം സെര്‍വര്‍ വിലാസങ്ങള്‍ തമ്മില്‍ കോമാ ഉപയോഗിച്ചു് വേര്‍തിരിക്കുക."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ഈ ബന്ധം പൂര്‍ത്തിയാക്കുന്നതിനായി IPv_6 അഡ്രസിങ് ആവശ്യമുണ്ടു്"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2022,755 +2270,861 @@ msgstr ""
 "IPv4-നുള്ള ശൃംഖലകളുമായി ബന്ധപ്പെടുമ്പോള്‍, IPv6 ക്രമീകരണം പരാജയപ്പെടുകയും IPv4 ക്രമീകരണം "
 "വിജയിക്കുകയും ചെയ്താല്‍ ബന്ധം പൂര്‍ത്തിയാക്കുവാന്‍ അനുവദിക്കുന്നു."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "മെട്രിക്"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_ഇംപോര്‍ട്ട് ചെയ്യുക"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "അടിസ്ഥാനം"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "ന_മ്പര്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "സങ്കീര്‍ണ്ണമായ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_എപിഎന്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_ശൃംഖല ഐഡി:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "മാറ്റുക..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "_പിന്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "വീട്ടിലെ ശൃംഖല ലഭ്യമല്ലെങ്കില്‍ _പുറത്തുള്ളവ അനുവദിക്കുക"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "അടയാളവാക്കുകള്‍ _കാണിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "തിരിച്ചറിയല്‍"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "അനുവദിച്ചിട്ടുള്ള രീതികള്‍:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "_രീതികള്‍ ക്രമീകരിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "ചുരുക്കല്‍"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "പോയിന്റ്-ടു-പോയിന്റ് എന്‍ക്രിപ്ഷന്‍ (MPPE) _ഉപയോഗിക്കുക "
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-ബിറ്റ് എന്‍ക്രിപ്ഷന്‍ _ആവശ്യമുണ്ടു്"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "_സ്റ്റേറ്റ്ഫുള്‍ MPPE ഉപയോഗിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_ബിഎസ്ഡി ഡേറ്റാ ചുരുക്കം അനുവദിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate ഡേറ്റാ ചുരുക്കം അനുവദിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP _ഹെഡര്‍ ചുരുക്കം ഉപയോഗിക്കുക"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "പ്രതിധ്വനി"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP _എക്കോ പാക്കറ്റുകള്‍ അയയ്ക്കുക"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_രീതി:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_രീതി:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "സങ്കീര്‍ണ്ണമായ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "എതര്‍നെറ്റ് ശൃംഖലകള്‍"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_മുന്‍ഗണന: "
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "സ്വകാര്യ _കീ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "കണ്ണി _ഇപ് സമയം:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "കണ്ണി _ഡൌണ്‍ സമയം:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP _ലക്ഷ്യങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP _ലക്ഷ്യങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ഈഥര്‍നെറ്റ്"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ബോണ്ടട് _ബന്ധങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ഈഥര്‍നെറ്റ്"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍ വിലാസം:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍ വിലാസം:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_മുന്‍ഗണന: "
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ട്രാന്‍സ്മിഷന്‍ _പവര്‍:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ട്രാന്‍സ്മിഷന്‍ _പവര്‍:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_പാരന്‍റ്റ് ഇന്റെര്‍ഫേസ്:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ഇന്റെര്‍ഫേസ് _നാമം:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_പകര്‍ത്തിയ MAC വിലാസം:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _ഐഡി:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ഉപകരണത്തിന്റെ പേര് + സംഖ്യ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + സംഖ്യ"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "സു_രക്ഷ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "എ (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "ബി/ജി (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "അഡ്-ഹോക്"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ട്രാന്‍സ്മിഷന്‍ _പവര്‍:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_നിരക്ക്:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_ചാനല്‍:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_ബാന്‍ഡ്:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "എസ്എസ്_ഐഡി:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "തിരിച്ചറിയാന്‍ അനുവദിച്ച രീതികള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "എക്സ്റ്റെന്‍സിബിള്‍ തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "പാസ്‌വേര്‍ഡ് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "മൈക്രോസോഫ്റ്റ് ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "മൈക്രോസോഫ്റ്റ് ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍ പതിപ്പു് 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2780,243 +3134,236 @@ msgstr ""
 "പിന്തുണയ്ക്കുന്നു. ബന്ധങ്ങള്‍ പരാജയപ്പെട്ടാല്‍, ചില മാര്‍ഗ്ഗങ്ങള്‍ക്കുള്ള പിന്തുണ പ്രവര്‍ത്ത രഹിതമാക്കി "
 "വീണ്ടും ശ്രമിക്കുക."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "വയര്‍ലസ്സ്"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "ബ്ലൂടൂത്ത്"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ്"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "ബോണ്ട്"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ബ്രിഡ്ജ്"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"വിപിഎന്‍ പ്ലഗിനു് വിപിഎന്‍ ബന്ധംശരിയായ ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിച്ചില്ല\n"
-"\n"
-"പിശക്: വിപിഎന്‍ സര്‍വീസ് തരം ലഭ്യമല്ല."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "വിപിഎന്‍ ബന്ധം ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ഫയല്‍ '%s' വിപിഎന്‍ ബന്ധവിവരം ലഭ്യമാക്കുവാന്‍ സാധിച്ചില്ല\n"
+"വിപിഎന്‍ പ്ലഗിനു് വിപിഎന്‍ ബന്ധംശരിയായ ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിച്ചില്ല\n"
 "\n"
-"പിശക്: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "അറിയാത്ത ഏതോ പ്രശ്നം"
+"പിശക്: വിപിഎന്‍ സര്‍വീസ് തരം ലഭ്യമല്ല."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ഇംപോര്‍ട്ട് ചെയ്യുന്നതിനുള്ള ഫയല്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "വിര്‍ച്ച്വല്‍"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "അപരിചിതമായ പിശക് കാരണം ബന്ധംഎഡിറ്റര്‍ ഡയലോഗ് ആരംഭിക്കുവാന്‍ സാധിച്ചില്ല."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "പുതിയ ബന്ധം ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "ബന്ധം നീക്കം ചെയ്യുന്നതില്‍ പരാജയം"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "നിങ്ങള്‍ക്കു് %s ബന്ധം വെട്ടിനീക്കണം എന്നുറപ്പാണോ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_വിപിഎന്‍ ബന്ധങ്ങള്‍"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "വിലാസം"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "നെറ്റ്‌മാസ്ക്"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ഗേറ്റ്‌വേ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "മെട്രിക്"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "പ്രീഫിക്സ്"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s ചിട്ടപ്പെടുത്തുന്നു"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "പേരില്ലാത്ത ബന്ധം ചിട്ടപ്പെടുത്തുന്നു"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "കണക്ഷന്റെ _പേരു്:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "എഡിറ്റര്‍ ആരംഭിക്കുന്നതില്‍ പിശക്."
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "ആവശ്യമുള്ള ചില ഉറവിടങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ ബന്ധം എഡിറ്ററിനു് സാധ്യമായില്ല (.ui ഫയല്‍ ലഭ്യമായില്ല)"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_സൂക്ഷിക്കുക"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ഈ കണക്ഷന്‍ വരുത്തിയിരിയ്ക്കുന്ന ഏതു് മാറ്റങ്ങളും സൂക്ഷിയ്ക്കുക."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "ഈ സിസ്റ്റത്തിലുള്ള എല്ലാ ഉപയോക്താക്കള്‍ക്കും ഉപയോഗിയ്ക്കാവുന്ന രീതിയില്‍ ഈ ബന്ധം സൂക്ഷിക്കുന്നതിനായി "
 "ആധികാരികത നല്‍കുക."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "ബന്ധം ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "ബന്ധ എഡിറ്റര്‍ ജാലകം ഉണ്ടാക്കുന്നതില്‍ അറിയാത്ത പിഴവ്."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "എഡിറ്റര്‍ ആരംഭിക്കുന്നതില്‍ പിശക്."
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3025,199 +3372,245 @@ msgstr ""
 "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന "
 "രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "കണക്ഷന്റെ _പേരു്:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_കയറ്റുമതി..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ഒരിക്കലും"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ഉടന്‍"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d മിനിറ്റ് മുമ്പു്"
 msgstr[1] "%d മിനിറ്റുകള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d മണിക്കൂര്‍ മുമ്പു്"
 msgstr[1] "%d മണിക്കൂറുകള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ദിവസം മുമ്പു്"
 msgstr[1] "%d ദിവസങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d മാസം മുമ്പു്"
 msgstr[1] "%d മാസങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d വര്‍ഷം മുമ്പു്"
 msgstr[1] "%d വര്‍ഷങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL ബന്ധം%d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL ബന്ധം%d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "പേര്"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ഏറ്റവും ഒടുവില്‍ ഉപയോഗിച്ചതു്"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം ചിട്ടപ്പെടുത്തുക."
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം ചിട്ടപ്പെടുത്തുന്നതിനു് മുമ്പ് ആധികാരികത ഉറപ്പാക്കുക."
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം നീക്കം ചെയ്യുക."
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധംഇല്ലാതാക്കുന്നതിനായി ആധികാരികത ഉറപ്പാക്കുക"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "പിന്തുണ ലഭ്യമല്ലാത്ത മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "എങ്ങനെ '%s' കണക്ഷനുകള്‍ തയ്യാറാക്കണമെന്നറിയില്ല"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "ബന്ധം സൃഷ്ടിയ്ക്കുമ്പോള്‍ തെറ്റു്"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "എങ്ങനെ '%s' കണക്ഷനുകള്‍ തയ്യാറാക്കണമെന്നറിയില്ല"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s'-മായുള്ളൊരു കണക്ഷന്‍ ലഭ്യമായില്ല"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "ശൃംഖല ബന്ധങ്ങള്‍"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_വിപിഎന്‍ ബന്ധങ്ങള്‍"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X സുരക്ഷ"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X സെക്യൂരിറ്റി യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "ഈ കണക്ഷനുവേണ്ടി 802.1_X സുരക്ഷ ഉപയോഗിക്കുക"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ഈഥര്‍നെറ്റ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ബ്ലൂടൂത് ഡിവൈസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ബോണ്ട് ബന്ധം %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "ബ്ലൂടൂത്ത്"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "എതര്‍നെറ്റ് ശൃംഖല"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "വയര്‍ലെസ് ശൃംഖല"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "ബോണ്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ബോണ്ട് ബന്ധം %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "ബ്രിഡ്ജ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ബ്രിഡ്ജ് ബന്ധം %d"
@@ -3225,33 +3618,38 @@ msgstr "ബ്രിഡ്ജ് ബന്ധം %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട്"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_പാരന്‍റ്റ് ഇന്റെര്‍ഫേസ്:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ബന്ധം%d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3261,44 +3659,43 @@ msgstr ""
 "മാക് വിലാസം ഇവിടെ സൂചിപ്പിക്കുന്ന ശൃംഖല ഡിവൈസിലേക്കുള്ള ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍ക്കും "
 "അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "അവഗണിക്കപ്പെട്ടവ"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ഈഥര്‍നെറ്റ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ഈഥര്‍നെറ്റ്"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "തനിപ്പകര്‍പ്പെടുത്ത മാക് വിലാസം:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ഈഥര്‍നെറ്റ് ബന്ധം %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "സ്വതവേയുള്ള"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3307,11 +3704,11 @@ msgstr ""
 "മേഖല ബന്ധത്തിന്റെ വിശ്വാസ നിലയെ നിര്‍ണ്ണയിക്കുന്നു. ഫയര്‍വാള്‍ ചാത്തന്‍ സജീവമാണെങ്കില്‍ മാത്രം "
 "കാണിക്കുന്നു."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "പൊതു യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3322,275 +3719,275 @@ msgstr ""
 "മാക് വിലാസം ഇവിടെ സൂചിപ്പിക്കുന്ന ശൃംഖല ഡിവൈസിലേക്കുള്ള ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍ക്കും "
 "അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ് ബന്ധം %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ഈഥര്‍നെറ്റ് ബന്ധം %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "ഓട്ടോമാറ്റിക് (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (VPN) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ഓട്ടോമാറ്റിക് വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "ഓട്ടോമാറ്റിക് (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (PPPoE) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "ഓട്ടോമാറ്റിക് (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (DHCP) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "ലിങ്ക്-ലോക്കല്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "കൂടുതല്‍ _ഡിഎന്‍എസ് സെര്‍വറുകള്‍:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "അധികമായി തെ_രയേണ്ട ഡൊമെയിനുകള്‍:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s-നുള്ള IPv4 റൂട്ടുകള്‍ ചിട്ടപ്പെടുത്തുക"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ഓട്ടോമാറ്റിക്, DHCP മാത്രം"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s-നുള്ള IPv6 റൂട്ടുകള്‍ ചിട്ടപ്പെടുത്തുക"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "വൈമാക്സ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "വൈമാക്സ് ബന്ധം %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s അടിമ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ബ്രോഡ്ബാന്‍ഡ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "പിന്തുണ ലഭ്യമല്ലാത്ത മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡര്‍ തരം തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
-"നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡര്‍ ഉപയോഗിക്കുന്ന ടെക്നോളജി തെരഞ്ഞെടുക്കുക.  "
-"നിങ്ങള്‍ക്കറിയില്ലെങ്കില്‍ പ്രൊവൈഡറിനോട് അന്വേഷിക്കുക."
+"നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡര്‍ ഉപയോഗിക്കുന്ന ടെക്നോളജി തെരഞ്ഞെടുക്കുക.  നിങ്ങള്‍"
+"ക്കറിയില്ലെങ്കില്‍ പ്രൊവൈഡറിനോട് അന്വേഷിക്കുക."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "എന്റെ പ്രൊവൈഡര്‍ _GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (i.e. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "എന്റെ പ്രൊവൈഡര്‍ C_DMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "സിഡിഎംഎ"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "ജിഎസ്എം"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s-നുള്ല PPP ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗങ്ങള്‍ ചിട്ടപ്പെടുത്തുന്നു"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "ബോണ്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "vlan യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL ബന്ധം%d"
@@ -3598,12 +3995,12 @@ msgstr "DSL ബന്ധം%d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട്"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
@@ -3611,58 +4008,58 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "ശൃംഖല ബന്ധം ലഭ്യമല്ല"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "vlan യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ബന്ധം%d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "വിപിഎന്‍ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s'-നുള്ള വിപിഎന്‍ പ്ലഗിന്‍ സര്‍വീസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s'-നുള്ള വിപിഎന്‍ പ്ലഗിന്‍ സര്‍വീസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ബന്ധമായില്ല"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "വിപിഎന്‍ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s'-നുള്ള വിപിഎന്‍ പ്ലഗിന്‍ സര്‍വീസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "വിപിഎന്‍ ബന്ധം%d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "ഒരു വിപിഎന്‍ കണക്ഷന്‍ രീതി തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3670,19 +4067,19 @@ msgid ""
 "not have the correct VPN plugin installed."
 msgstr ""
 "പുതിയ കണക്ഷനുവേണ്ടി നിങ്ങള്‍ ഉപയോഗിക്കുവാന്‍ ആഗ്രഹിക്കുന്ന തരത്തിലുള്ള വിപിഎന്‍ ബന്ധം "
-"തെരഞ്ഞെടുക്കുക.  നിങ്ങള്‍ക്കു് ആവശ്യമുള്ളതു് പട്ടികയില്‍ ലഭ്യമല്ല എങ്കില്‍, നിങ്ങള്‍ ശരിയായ പ്ലഗിന്‍ "
-"ഇന്‍സ്റ്റോള്‍ ചെയ്തിട്ടുണ്ടാവില്ല."
+"തെരഞ്ഞെടുക്കുക.  നിങ്ങള്‍ക്കു് ആവശ്യമുള്ളതു് പട്ടികയില്‍ ലഭ്യമല്ല എങ്കില്‍, നിങ്ങള്‍ ശരിയായ പ്ലഗിന്‍ ഇന്‍"
+"സ്റ്റോള്‍ ചെയ്തിട്ടുണ്ടാവില്ല."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 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"
 msgstr ""
-"BSSID ഇവിടെ സൂചിപ്പിക്കുന്ന വയര്‍ലെസ് ആക്സെസ് പോയിന്റിലേക്കുള്ള (എപി) ബന്ധം ഈ ഐച്ഛികം "
-"മാറ്റാര്‍ക്കും അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
+"BSSID ഇവിടെ സൂചിപ്പിക്കുന്ന വയര്‍ലെസ് ആക്സെസ് പോയിന്റിലേക്കുള്ള (എപി) ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍"
+"ക്കും അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3692,94 +4089,92 @@ msgstr ""
 "മാക് വിലാസം ഇവിടെ സൂചിപ്പിക്കുന്ന ശൃംഖല ഡിവൈസിലേക്കുള്ള ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍ക്കും "
 "അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "വൈഫൈ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ഏതെങ്കിലും ഡിവൈസ്"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "വയര്‍ലസ് ബന്ധം %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ഡബ്ലിയുഇപി 40/128-bit കീ (ഹെക്സോ ആസ്കിയോ)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ഡൈനമിക് WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 എന്റര്‍പ്രൈസ്"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "വൈഫൈ സുരക്ഷ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല; വൈഫൈ ക്രമീകരണം ലഭ്യമല്ല."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "വയര്‍ലെസ് സെക്യൂരിറ്റി"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "വൈഫൈ സെക്യൂരിറ്റി യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" എന്ന പേരില്‍ ഒരു ഫയല്‍ നിലവിലുണ്ടു്."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_മാറ്റിസ്ഥാപിക്കുക"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "നിങ്ങള്‍ സൂക്ഷിച്ചുകൊണ്ടിരിക്കുന്ന വിപിഎന്‍ ബന്ധംഉപയോഗിച്ചു് %s മാറ്റണമോ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "വിപിഎന്‍ ബന്ധം എക്സ്പോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിച്ചില്ല"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3790,221 +4185,106 @@ msgstr ""
 "\n"
 "പിശക്: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "വിപിഎന്‍ ബന്ധം എക്സ്പോര്‍ട്ട് ചെയ്യുക..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_പൂട്ട് തുറക്കുക"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "ഈ ഉപകരണം സ്വയം തുറക്കുക"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ബന്ധവിവരം"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "സജീവ ശൃംഖല ബന്ധങ്ങള്‍"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "സ്വകാര്യ _കീ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം താഴെ പറഞ്ഞിരിക്കുന്ന ക്രമീകരണങ്ങള്‍കൊണ്ട് സജ്ജമാക്കിയിരിക്കുന്നു:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "നിങ്ങളുടെ ഡിവൈസ്:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "നിങ്ങളുടെ പ്ലാന്‍:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"നിങ്ങള്‍ തെരഞ്ഞെടുത്ത ക്രമീകരണങ്ങള്‍ ഉപയോഗിച്ച് നിങ്ങളുടെ മൊബൈല്‍ പ്രൊവൈഡറിലേക്ക് ഒരു ബന്ധം ഇപ്പോള്‍ "
-"നല്‍കുന്നു. ബന്ധം പരാജയപ്പെടുകയോ, ശൃംഖല സോഴ്സുകള്‍ ലഭ്യമാക്കുകയോ സാധ്യമല്ലെങ്കില്‍, ക്രമീകരണങ്ങളില്‍ "
-"ഡബിള്‍ ക്ലിക്ക് ചെയ്യുക. നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം ക്രമീകരണങ്ങള്‍ മാറ്റുന്നതിനായി, "
-"സിസ്റ്റം >> മുന്‍ഗണനകള്‍ എന്ന മെനുവില്‍ നിന്നും \"ശൃംഖല ബന്ധങ്ങള്‍\" തെരഞ്ഞെടുക്കുക."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "പട്ടികയിലില്ലാത്ത"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "നിങ്ങളുടെ പ്ലാന്‍ _തെരെഞ്ഞെടുക്കുക:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "തെരഞ്ഞെടുത്ത പ്ലാന്‍ _APN (ആക്സസ് പോയിന്റ് നെയിം):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"മുന്നറിയിപ്പു്: തെറ്റായ പ്ലാന്‍ തെരഞ്ഞെടുക്കുന്നതു് ബില്ലിങില്‍ പ്രശ്നങ്ങള്‍ ഉണ്ടാക്കുന്നു, അല്ലെങ്കില്‍ ബന്ധം "
-"തടസ്സപ്പെടുത്തുന്നു.\n"
-"\n"
-"നിങ്ങളുടെ പ്ലാന്‍ ഏതെന്നുറപ്പല്ലെങ്കില്‍, ദയവായി നിങ്ങളുടെ പ്രൊവൈഡറില്‍ നിന്നും APN ലഭ്യമാക്കുക."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "നിങ്ങളുടെ ബില്ലിങ് പ്ലാന്‍ തെരഞ്ഞെടുക്കുക"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "എന്റെ പ്ലാന്‍ പട്ടികയിലില്ല..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "_പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "പ്രൊവൈഡര്‍"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "പ്രൊവൈഡര്‍:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "എന്റെ പ്രൊവൈഡര്‍ GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "എന്റെ പ്രൊവൈഡര്‍ CDMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "രാജ്യങ്ങളുടേയോ പ്രദേശങ്ങളുടേയോ പട്ടിക:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "രാജ്യമോ പ്രദേശമോ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "നിങ്ങളുടെ ദാതാവിന്റെ രാജ്യമോ പ്രദേശമോ തിരഞ്ഞെടുക്കുക"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന GSM ഡിവൈസ്"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന CDMA ഡിവൈസ്"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ഏതെങ്കിലും ഡിവൈസ്"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4012,187 +4292,265 @@ msgstr ""
 "ഈ സഹായി നിങ്ങളെ എളുപ്പത്തില്‍ ഒരു സെല്ലുലാര്‍ (3G) നെറ്റ്‌വര്‍ക്കിലേക്ക് നിങ്ങളുടെമൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് "
 "ബന്ധം സജ്ജമാക്കുന്നു."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "നിങ്ങള്‍ക്ക് ഈ വിവരങ്ങള്‍ ആവശ്യമാകുന്നു:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡറിന്റെ പേര്"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(ചില സാഹചര്യങ്ങളില്‍) നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍ APN (ആക്സസ് പോയിന്റ് നെയിം)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ഈ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് ഒരു ബന്ധം ഉണ്ടാക്കുക:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ഏതെങ്കിലും ഡിവൈസ്"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ഒരു മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം സജ്ജമാക്കുക"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "രാജ്യമോ പ്രദേശമോ"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "നിങ്ങളുടെ ദാതാവിന്റെ രാജ്യമോ പ്രദേശമോ തിരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "_പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ CDMA ടെക്നോളജി ഉപയോഗിക്കുന്നു (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "നിങ്ങളുടെ പ്ലാന്‍ _തെരെഞ്ഞെടുക്കുക:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "തെരഞ്ഞെടുത്ത പ്ലാന്‍ _APN (ആക്സസ് പോയിന്റ് നെയിം):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"മുന്നറിയിപ്പു്: തെറ്റായ പ്ലാന്‍ തെരഞ്ഞെടുക്കുന്നതു് ബില്ലിങില്‍ പ്രശ്നങ്ങള്‍ ഉണ്ടാക്കുന്നു, അല്ലെങ്കില്‍ ബന്ധം "
+"തടസ്സപ്പെടുത്തുന്നു.\n"
+"\n"
+"നിങ്ങളുടെ പ്ലാന്‍ ഏതെന്നുറപ്പല്ലെങ്കില്‍, ദയവായി നിങ്ങളുടെ പ്രൊവൈഡറില്‍ നിന്നും APN ലഭ്യമാക്കുക."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "നിങ്ങളുടെ ബില്ലിങ് പ്ലാന്‍ തെരഞ്ഞെടുക്കുക"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം താഴെ പറഞ്ഞിരിക്കുന്ന ക്രമീകരണങ്ങള്‍കൊണ്ട് സജ്ജമാക്കിയിരിക്കുന്നു:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "നിങ്ങളുടെ ഡിവൈസ്:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "നിങ്ങളുടെ പ്ലാന്‍:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"നിങ്ങള്‍ തെരഞ്ഞെടുത്ത ക്രമീകരണങ്ങള്‍ ഉപയോഗിച്ച് നിങ്ങളുടെ മൊബൈല്‍ പ്രൊവൈഡറിലേക്ക് ഒരു ബന്ധം ഇപ്പോള്‍ "
+"നല്‍കുന്നു. ബന്ധം പരാജയപ്പെടുകയോ, ശൃംഖല സോഴ്സുകള്‍ ലഭ്യമാക്കുകയോ സാധ്യമല്ലെങ്കില്‍, ക്രമീകരണങ്ങളില്‍ "
+"ഡബിള്‍ ക്ലിക്ക് ചെയ്യുക. നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം ക്രമീകരണങ്ങള്‍ മാറ്റുന്നതിനായി, "
+"സിസ്റ്റം >> മുന്‍ഗണനകള്‍ എന്ന മെനുവില്‍ നിന്നും \"ശൃംഖല ബന്ധങ്ങള്‍\" തെരഞ്ഞെടുക്കുക."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ഒന്നുമില്ല)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "അപരിചിതം"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_പൂട്ട് തുറക്കുക"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "അടയാളവാക്ക് എപ്പോഴും ചോ_ദിക്കുക"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s'-ലേക്കു് ബന്ധപ്പെടുന്നതിനായി ഒരു അടയാളവാക്ക് ആവശ്യമുണ്ടു്."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "അടയാളവാക്കുക _കാണിക്കുക"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "അടയാളവാക്കുക _കാണിക്കുക"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_അടയാളവാക്ക്:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ബന്ധം വിഛേദിക്കുക"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ഡൈനമിക് WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_ഉണ്ടാക്കുക"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4200,35 +4558,35 @@ msgstr ""
 "വയര്‍ലെസ് ശൃംഖല '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി അടയാളവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ആവശ്യമുണ്ടു്"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ഉറപ്പിക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "നിങ്ങള്‍ ഉണ്ടാക്കുവാന്‍ ആഗ്രഹിക്കുന്ന വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റെ പേരു് നല്‍കുക."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖല"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4236,35 +4594,55 @@ msgstr ""
 "നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്ന അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റ് പേരും സുരക്ഷാ "
 "വിശദാംശങ്ങളും നല്‍കുക"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "ക_ണക്ഷന്‍:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "എന്റെ പ്രൊവൈഡര്‍ ലഭ്യമല്ല, സ്വയം നല്‍കുവാന്‍ ആഗ്രഹിക്കുന്നു:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "പ്രൊവൈഡര്‍:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "രാജ്യങ്ങളുടേയോ പ്രദേശങ്ങളുടേയോ പട്ടിക:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "രാജ്യമോ പ്രദേശമോ"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "വയര്‍ഡ്"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC മെഷ്"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "യുഎസ്ബി"
 
@@ -4274,17 +4652,39 @@ msgstr "യുഎസ്ബി"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_ശൃംഖലയുടെ പേരു്:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ക_ണക്ഷന്‍:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ഉപയോഗം:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4292,419 +4692,474 @@ msgstr ""
 "ഈ പ്രോഗ്രാം ശൃംഖലമാനേജറിന്റെ ഒരു ഘടകമാണു് (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "ഇതു് കമാന്‍ഡ് ലൈന്‍ ഇടപെടലിനു് ഉചിതമല്ല, പകരം ഗ്നോം പണിയിട എന്‍വയോണ്മെന്റില്‍ പ്രവര്‍ത്തിക്കുന്നു."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "പ്രവര്‍ത്തന സജ്ജമല്ല"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "രജിസ്ടര്‍ ചെയ്തിട്ടില്ല"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ഹോം ശൃംഖല (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ഹോം ശൃംഖല "
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "തെരയുന്നു"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "രജിസ്ട്രേഷന്‍ നിഷേധിച്ചിരിക്കുന്നു"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s റോമിങ്)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (റോമിങ്)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "റോമിങ് ശൃംഖല (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "റോമിങ് ശൃംഖല"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%2$s' ലെ സിം കാര്‍ഡ് '%1$s' നു് പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' സജീവമാണു്: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "പുറത്തുള്ള"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s കണക്ഷന്‍"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER അല്ലെങ്കില്‍ PEM സര്‍ട്ടിഫീക്കേറ്റുകള്‍ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, അല്ലെങ്കില്‍ PKCS#12 സ്വകാര്യ കീകള്‍ (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ഒരു പിഎസി ഫയല്‍ തിരഞ്ഞെടുക്കുക..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "പിഎസി ഫയലുകള്‍ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "എല്ലാ ഫയലുകളും"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "വെളിപ്പെടുത്താതെ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "തിരിച്ചറിഞ്ഞിരിയ്ക്കുന്നു"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "രണ്ടും"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_അ‍ജ്ഞാതം:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "പിഎസി _ഫയല്‍:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_ആന്തരിക ആധികാരികത ഉറപ്പാക്കല്‍"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ഓട്ടോമാറ്റിക് പിഎസി അനുവദിയ്ക്കുക"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "പതിപ്പ് 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "പതിപ്പ് 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "പിഇഎപി _പതിപ്പ്:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "അടയാളവാക്കുക _കാണിക്കുക"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "എഫ്എഎസ്‌ടി"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ടണ്‍ല്ഡ് TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "സുരക്ഷിതമായ EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (സഹജം)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "തുറന്ന സിസ്റ്റം"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "പങ്കുവച്ച കീ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (സഹജം)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_കീ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "കീ കാ_ണിക്കുക"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP _സൂചിക:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_തരം:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (സഹജം)"
+
+#~ msgid "Ignored"
+#~ msgstr "അവഗണിക്കപ്പെട്ടവ"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "അപരിചിതമായ പിശക് കാരണം ബന്ധ രഹസ്യങ്ങള്‍ പരിഷ്കരിക്കുന്നതില്‍ പരാജയം."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_മുന്‍ഗണന: "
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "ലഭ്യമാണെങ്കില്‍ ഈ ശൃംഖലയിലേക്ക് _തനിയെ ബന്ധിപ്പിക്കുക"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "ബന്ധ _വിവരം"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "വിപിഎന്‍ ബന്ധം ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ഫയല്‍ '%s' വിപിഎന്‍ ബന്ധവിവരം ലഭ്യമാക്കുവാന്‍ സാധിച്ചില്ല\n"
+#~ "\n"
+#~ "പിശക്: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "അറിയാത്ത ഏതോ പ്രശ്നം"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "ശൃംഖല മാനേജര്‍"
@@ -4738,15 +5193,6 @@ msgstr "_തരം:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Aut_onegotiate"
 
@@ -4841,12 +5287,6 @@ msgstr "_തരം:"
 #~ msgid "BSID:"
 #~ msgstr "ബിഎസ്ഐഡി:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "രണ്ടാമത്തെ ഡിഎന്‍എസ്:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "മൂന്നാമത്തെ ഡിഎന്‍എസ്:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_ഉപകരണത്തിന്റെ മാക് വിലാസം:"
 
@@ -4898,12 +5338,6 @@ msgstr "_തരം:"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "ഓട്ടോമാറ്റിക് (PPP) വിലാസങ്ങള്‍ മാത്രം"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "വൈമാക്സ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "വൈമാക്സ് ബന്ധം %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4924,9 +5358,6 @@ msgstr "_തരം:"
 #~ msgid "Error: %s"
 #~ msgstr "പിശക്: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "ഡിയുഎന്‍ കണക്ഷനുണ്ടാക്കുന്നതില്‍ പരാജയം: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "ഫോണ്‍ ഉപയോഗിക്കുവാന്‍ തയ്യാര്‍!"
 
@@ -4976,14 +5407,8 @@ msgstr "_തരം:"
 #~ "a Certificate Authority certificate?"
 #~ msgstr ""
 #~ "ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി (CA) സര്‍ട്ടിഫീക്കേറ്റ് ഉപയോഗിച്ചില്ല എങ്കില്‍, "
-#~ "സുരക്ഷിതമല്ലാത്ത വയര്‍ലെസ് ശൃംഖലകളിലേയ്ക്കു് കടക്കുവാന്‍ സാധ്യതയുണ്ടു്. നിങ്ങള്‍ക്കു് ഒരു "
-#~ "സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കണമോ?"
-
-#~ msgid "No"
-#~ msgstr "ഇല്ല"
-
-#~ msgid "Yes"
-#~ msgstr "ഉവ്വു്"
+#~ "സുരക്ഷിതമല്ലാത്ത വയര്‍ലെസ് ശൃംഖലകളിലേയ്ക്കു് കടക്കുവാന്‍ സാധ്യതയുണ്ടു്. നിങ്ങള്‍ക്കു് ഒരു സര്‍"
+#~ "ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കണമോ?"
 
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "വയര്‍ലെസ് ശൃംഖലകള്‍ (%s)"
@@ -5023,12 +5448,6 @@ msgstr "_തരം:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "വയര്‍ലെസ് ബന്ധം %d"
 
-#~ msgid "_Import"
-#~ msgstr "_ഇംപോര്‍ട്ട് ചെയ്യുക"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "_സ്വയം കണക്ട് ചെയ്യുക"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "എല്ലാ ഉപയോക്താക്കള്‍ക്കും ലഭ്യമാകുക"
 
diff --git a/po/mr.po b/po/mr.po
index 16d35a11..7f4531f5 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-03-28 16:06+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
@@ -19,239 +20,262 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "नेटवर्क"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "नेटवर्क जोडणी नियंत्रीत करा"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "नेटवर्क जोडणी"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "सक्रीय नेटवर्क जोडणी"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "नेटवर्क संयोजना व्यवस्थापीत करा व बदला"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "जोडलेले सूचना बंद करा"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "खंडीत सूचना बंद करा"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "जोडलेले सूचना बंद करा"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "नेटवर्क्स् उपलब्धता सूचना दाखवू नका"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "वायरलेस नेटवर्क्स् उपलब्ध झाल्यावर यांस TRUE असे सेट करा."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "स्टॅम्प"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "सेटिंग्स्ला नवीन आवृत्तीकरीता स्थानांतरीत करायचे, हे ओळखण्यासाठी वापर केला जातो."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi निर्माण बंद करा"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "ऍप्लेटचा वापर करतेवेळी ऍडहॉक नेटवर्क्स्चे निर्माण बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "CA प्रमाणपत्र नीवडा"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager ॲप्लेट"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "नेटवर्क जोडणी आढळली नाही"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager ॲप्लेट"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Wired 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "जुळवा (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "नेटवर्कचे नाव (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "ॲडहॉक"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "PAN जोडणी निर्माण करणे अशक्य: %s"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "अपरिचीत"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "जोडणी समावेश करणे अपयशी"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "जोडणी मोडली"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "जोडणी मोडली"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "जोडणी समावेश करणे अपयशी"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "हा संदेश पुन्हा दाखवू नका"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -261,7 +285,7 @@ msgstr ""
 "\n"
 "नेटवर्क जोडणीत व्यत्यय आणल्यामुळे VPN जोडणी '%s' तुटली."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -271,7 +295,7 @@ msgstr ""
 "\n"
 "नेटवर्क जोडणी अंतर्गत व्यत्यय आण्याल्यामुले VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,7 +304,7 @@ msgstr ""
 "\n"
 "VPN सेवा अनपेक्षीतरित्या थांबविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "\n"
 "VPN सेवाने अवैध संयोजना पुरविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "\n"
 "जोडणी स्थापन प्रयत्न करीता वेळ संपल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "\n"
 "VPN सेवा वेळे सुरू न झाल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "VPN सेवा सुरू होण्यास अपयशी ठरल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN प्रवेश संदेश"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN जोडणी अपयशी"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -377,7 +401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,581 +414,606 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "साधन सज्ज नाही (फर्मवेअर आढळले नाही)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "साधन सज्ज नाही"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "जोडणी मोडली"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "जोडणी मोडा"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "साधन व्यवस्थापीत केले गेले नाही"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "नेटवर्क साधन उपलब्ध नाही"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN जोडणी (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN संरचीत करा (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN जोडणी (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager कार्यरत नाही..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "नेटवर्क बंद केले"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "नेटवर्क कार्यान्वीत करा (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "वायरलेस कार्यान्वीत करा (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबँड सुरू करा (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "सूचना सुरू करा (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "जोडणी विषयी माहिती (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "जोडणी संपादीत करा..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "विषयी (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "तुम्ही आता '%s' शी जुळले आहात."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "जोडणी मोडली"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "नेटवर्क जोडणी मोडली."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "नेटवर्क जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "नेटवर्क जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' करीता नेटवर्क पत्तासाठी विनंती करत आहे..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "नेटवर्क जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN जोडणी '%s' सुरू करत आहे..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' करीता VPN पत्ता विनंतीकृत करत आहे..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "नेटवर्क जोडणी आढळली नाही"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ॲप्लेट"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "चुकीचा PUK कोड; कृपया प्रोव्हाइडरशी संपर्क करा."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "चुकीचा PIN कोड; कृपया प्रोव्हाइडरशी संपर्क करा."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "कुलूपबंद अशक्य कोड पाठवत आहे..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "मोबाइल ब्रॉडबँड (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबँड"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "उपल्बध"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "जोडणी स्थापीत"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "तुम्ही आत्ता मोबाईल ब्रॉडबँड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "मोबाइल ब्रॉडबँड नेटवर्क पासवर्ड"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "तुम्ही आत्ता मोबाईल ब्रॉडबँड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' संयोजीत करत आहे..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' करीता वापरकर्त्याला ओळख पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "स्वयं Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "वायर्ड नेटवर्क्स् (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "वायर्ड नेटवर्क (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "वायर्ड नेटवर्क्स्"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "वायर्ड नेटवर्क"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "वायर्ड नेटवर्क जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "वायर्ड नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "वायर्ड नेटवर्क जोडणी '%s' करीता वापरकर्त्याची ओळक पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' करीता वायर्ड नेटवर्क पत्ता विनंतीकृत करत आहे..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "करीता वायर्ड नेटवर्क जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ओळख पटवणे"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "नवीन वायरलेस नेटवर्क बनवा"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(काहिच नाही)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "नवीन जोडणी संपादीत करणे अशक्य"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "वायर्ड नेटवर्क्स् (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "वायर्ड नेटवर्क (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "वायर्ड नेटवर्क"
 msgstr[1] "वायर्ड नेटवर्क"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX बंद केले"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX हार्डवेअर स्विचद्वारे असमर्थीत आहे"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "अधिक नेटवर्क्स्"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "वायरलेस नेटवर्क्स् उपलब्ध"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नेटवर्क मेन्यूचा वापर करा"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "तुम्ही आता वाइ-फाइ नेटवर्क '%s' सह जुळले आहात."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "नेटवर्क जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "वायर्ड नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "वायरलेस नेटवर्क '%s' करीता वापरकर्त्याची ओळख पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' करीता नेटवर्क पत्तासाठी विनंती करत आहे..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "वायरलेस नेटवर्क जोडणी '%s' सक्रीय आहे: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "करीता वायर्ड नेटवर्क जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "PAN जोडणी निर्माण करणे अशक्य: %s"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "जोडणी माहिती प्रदर्शित करतेवेळी त्रुटी आढळली:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "गतिक WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "पत्ते"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "काहीच नाही"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (पूर्वनिर्धारीत)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "अपरिचीत"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP पत्ता"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ब्रॉडकास्ट पत्ता"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "सबनेट मास्क"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "पहिले DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "दुसरे DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "तिसरे DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "इथरनेट (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "सर्वसामान्य"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "संवाद"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "हार्डवेअर पत्ता"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ड्राइवर"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "गती"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "सुरक्षा:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "पूर्वनिर्धारीत मार्ग"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "दुर्लक्ष केले"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "पासवर्ड:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "प्रकार (_T):"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "गेटवे"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "वापरकर्त्याचे नाव (_U):"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "जोडणी (_n):"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "अपरिचीत"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "वैध सक्रीय जोडणी आढळली नाही!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -972,49 +1021,53 @@ msgstr ""
 "सर्वहक्कस्वाधीन © 2005-2008 Novell, Inc.\n"
 "व अनेक इतर सामूहीक सहभागी व भाषांतरनकर्ता"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "नेटवर्क साधन व जोडणी व्यवस्थापीत करण्याकरीता सूचना क्षेत्र ॲप्लेट."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager संकेतस्थळ"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 "NetworkManager ॲप्लेटला काहिक आवश्यक स्त्रोत आढळले नाही (.ui फाइल आढळले नाही)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "न आढळलेली स्त्रोत"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "मोबाइल ब्रॉडबँड नेटवर्क पासवर्ड"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' शी जोडणी स्थापीत करण्याकरीता पासवर्ड आवश्यक आहे."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "पासवर्ड:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1022,25 +1075,25 @@ msgid ""
 msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PIN कोड आवश्यक आहे."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN कोड:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN कोड दाखवा"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1048,35 +1101,42 @@ msgid ""
 msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PUK कोड आवश्यक आहे."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK कोड:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "नवीन PIN कोड:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "नवीन PIN कोड पुनः द्या:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "जोडणी माहिती"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN जोडणी निर्माण करणे अशक्य: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1085,42 +1145,42 @@ msgstr ""
 "IP पत्ते फक्त नेटवर्कवरील संगणक ओळखतात.  IP पत्ता समावेश करण्यासाठी \"Add\" बटणावर "
 "क्लिक करा."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "नष्ट करा (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "स्वयंरित्या प्राप्त राऊटसकडे दुर्लक्ष करा (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "फक्त नेटवर्कवरील स्त्रोत करीता या जोडणीचा वापर करा (_o)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1128,17 +1188,17 @@ msgstr ""
 "कार्यान्वीत असल्यास, ही जोडणी पूर्वनिर्धारीत नेटवर्क जोडणी नुरूप कधिच वापरली जाणार "
 "नाही."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "निर्माण करा…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "VPN जोडणी प्रकार नीवडा"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1149,85 +1209,100 @@ msgstr ""
 "नवीन जोडणी करीता वापरण्याजोगी VPN चे प्रकार नीवडा.  पसंतीचे  VPN जोडणी यादीत न "
 "आढळल्यास, तुमच्याकडे योग्य VPN प्लगइन प्रतिष्ठापीत नसावे."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "सर्व्हिस (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "राऊंड-रॉबिन"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "सक्रीय बॅकअप"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ब्रॉडकास्ट"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "अडॅप्टिव्ह ट्रांस्मिट लोड बॅलेंसिंग"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "अडॅप्टिव्ह लोड बॅलेंसिंग"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (शिफारसीय)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "बाँड संपन्न जोडण्या (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "पद्धत (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "संपादित करा (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "फ्रिक्वेंसी नियंत्रीत करा (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "संवाद नाव (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Link Monitoring:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP लक्ष्य (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1235,125 +1310,178 @@ msgstr ""
 "दुवा स्थिती तपासतेवेळी शोधण्याजोगी एक IP पत्ता, किंवा IP पत्त्यांची स्वल्पविराम-विभाजीत "
 "सूची."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "लिंक अप विलंब (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "लिंक डाउन विलंब (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "पहिले DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MTU (_M):"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "बाइटस्"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "सुरक्षा (_S):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "वायर्ड जोडणी %d"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "लिंक डाउन विलंब (_d):"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "नेटवर्क कार्यान्वीत करा (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "स्वयं"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "पूर्वनिर्धारीत"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1363,438 +1491,529 @@ msgstr ""
 "येथे दिलेले MAC पत्ता सक्रीय नेटवर्क साधणकरीता हार्डवेअर पत्ता म्हणून वापरले जाईल.  या "
 "गुणविशेषला MAC क्लोनिंग किंवा स्पूफिंग असे म्हटले जाते. उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "पत्ता"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "पत्ता"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "हार्डवेअर पत्ता:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "कुठलेही साधण"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "अपरिचीत त्रुटीमुळे जोडणी गोपणीयता अद्ययावत करण्यास अपयशी."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "या जोडणी करीता 802.1X सुरक्षा वापरा"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "वापरकर्त्याचे नाव (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "सर्व्हिस (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "पासवर्ड दाखवा (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "पासवर्ड (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "संवाद"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "पॅरेंट संवाद (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "पॅरेंट संवाद (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "स्वयं"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ट्विस्टेड पैर (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "अटॅचमेंट युनिट इंटरफेसय़ (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "मिडीया इंडिपेंडंट इंटरफेस (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "दुर्लक्ष करा"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "मॅन्यूअल"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "पोर्ट (_P):"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "सर्व्हिस (_S):"
+msgid "_Port"
+msgstr "पोर्ट (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "क्लोंड MAC पत्ता (_C):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "पूर्वनिर्धारीत"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "दुर्लक्ष करा"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ब्रॉडकास्ट पत्ता:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "गती (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "फूल ड्युप्लेक्स् (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "काहीच नाही"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "जोडणी विषयी माहिती (_I)"
+msgid "_Metered connection"
+msgstr "जोडणी (_n):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "स्वयं जुळवा (_a)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1803,7 +2022,7 @@ msgstr ""
 "IP पत्ते फक्त नेटवर्कवरील संगणक ओळखतात.  IP पत्ता समावेश करण्यासाठी \"Add\" बटणावर "
 "क्लिक करा."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1811,127 +2030,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "स्वयं, फत्त पत्ते"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "पत्ते"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ट्रांसपोर्ट मोड (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "डाटाग्राम"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "जोडणी केली"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "ट्रांसपोर्ट मोड (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "साधन नाव + क्रमांक"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "इथरनेट (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "स्वयं तसेच स्वहस्ते DNS सेटिंग्स् सह"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "दुवा-स्थानीय"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "इतर संगणकाशी सहभागीय केले"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "पद्धत (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1941,8 +2164,8 @@ msgstr ""
 "DHCP क्लाएंट आयडेंटिफायर नेटवर्क प्रशासकाला संगणाची संरचना पसंतीचे करण्यास परवानगी देतो.  "
 "DHCP क्लाएंट आयडेंटिफायरचा वापर करायचे असल्यास, येथे एन्टर करा."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1950,26 +2173,26 @@ msgstr ""
 "यजमान नावांची निवारण करतेवेळी वापरण्याजोगी क्षेत्र. एकापेक्षा जास्त क्षेत्र वेगळे करण्यासाठी "
 "स्वल्पविरामचा वापर करा."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP क्लाऐंट ID (_H):"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "क्षेत्र शोधा (_S):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS सर्व्हर्स् (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1977,12 +2200,12 @@ msgstr ""
 "यजमान नावांचे निवारण करण्यासाठी वापरण्याजोगी डोमेन नेम सर्व्हर्स्चे IP पत्ते.  एकापेक्षा "
 "जास्त डोमेन नेम सर्व्हर पत्ते वेगळे करण्यासाठी स्वल्पविरामचा वापर करा."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "जोडणी पूर्ण करण्यासाठी IPv4 पत्ता आवश्यक आहे"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1990,25 +2213,34 @@ msgstr ""
 "IPv6-सक्षम नेटवर्क्ससह जोडणी करतेवेळी, IPv4 संरचना अपयशी परंतु IPv6 संरचना यशस्वी "
 "झाल्यास, जोडणी संपन्न होण्यासाठी विनंती स्वीकारली जाते."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "राऊट्स् (_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "बंद"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2018,16 +2250,20 @@ msgstr ""
 "यजमान नावांचे निवारण करण्यासाठी वापरण्याजोगी डोमेन नेम सर्व्हर्स्चे IP पत्ते.  एकापेक्षा "
 "जास्त डोमेन नेम सर्व्हर पत्ते वेगळे करण्यासाठी स्वल्पविरामचा वापर करा."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "जोडणी पूर्ण होण्यासाठी IPv6 पत्ता आवश्यक आहे"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2035,754 +2271,858 @@ msgstr ""
 "IPv4-सक्षम नेटवर्क्ससह जोडणी करतेवेळी, IPv6 संरचना अपयशी परंतु IPv4 संरचना यशस्वी "
 "झाल्यास, जोडणी संपन्न होण्यासाठी विनंती स्वीकारली जाते."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "मेट्रीक"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "आयात करा (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "मूळ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "क्रमांक (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "प्रगत"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "नेटवर्क ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "बदल करा..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "होम नेटवर्क उपलब्ध नसल्यास रोमींग स्वीकारा"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "पासवर्डस् दाखवा (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "ओळख पटवा"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "स्वीकार्य पद्धती:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "पद्धती संरचीत करा (_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "संकोचन"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "पॉईंट-टू-पॉईंट एनक्रिप्शन (MPPE) चा वापर करा (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-बीट एनक्रिप्शन आवश्यक (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "स्तरीय MPPE चा वापर करा (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD डाटा संकोचन स्वीकारा (_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "डिफ्लेट डाटा संकोचन स्वीकारा (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP हेडर संकोचनचा वापर करा (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "एको"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP echo पॅकेट्स् पाठवा (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "पद्धत (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "काहीच नाही"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "पद्धत (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "प्रगत"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "वायर्ड नेटवर्क्स्"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "सुरक्षा (_S):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "सुरक्षा (_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "सुरक्षा (_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "प्राइव्हेट कि (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "लिंक अप विलंब (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "लिंक डाउन विलंब (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "पॅरेंट संवाद (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP लक्ष्य (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP लक्ष्य (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "सुरक्षा (_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "इथरनेट (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "जोडणी (_n):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "हार्डवेअर पत्ता:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "हार्डवेअर पत्ता:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "सुरक्षा (_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ट्रान्समिशन पावर (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ट्रान्समिशन पावर (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "पॅरेंट संवाद (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "संवाद नाव (_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "क्लोंड MAC पत्ता (_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN id (_i):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "साधन नाव + क्रमांक"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + क्रमांक"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "सुरक्षा:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ॲडहॉक"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ट्रान्समिशन पावर (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "दर (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "मार्ग (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "बॅन्ड (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "स्वीकार्य ओळख पटवण्याच्या पद्धती"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "एक्सटेंसीबल ऑथेंटीकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "पासवर्ड ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v2 (_2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल वर्जन 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2791,443 +3131,481 @@ msgstr ""
 "बहुतांश उदाहरणांत, PPP सर्वर सर्व ओळख पटवण्याचे पद्धती करीता समर्थन पुरवितो.  जोडणी "
 "अपयशी ठरल्यास, काहिक पद्धतीकरीता समर्थन अकार्यान्वीत करण्याचा प्रयत्न करा."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "इंफिनिबँड"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "बाँड"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ब्रिज"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN प्लगइन VPN जोडणी योग्यरित्या आयात करण्यास अपयशी ठरले\n"
-"\n"
-"त्रुटी: VPN सेवा प्रकार आढळले नाही."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN जोडणी आयात करणे अशक्य"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"फाइल '%s' वाचनजोगी नाही किंवा त्यात ओळखण्याजोगी VPN जोडणी माहिती समाविष्टीत "
-"नाही\n"
+"VPN प्लगइन VPN जोडणी योग्यरित्या आयात करण्यास अपयशी ठरले\n"
 "\n"
-"त्रुटी: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "अपरिचीत"
+"त्रुटी: VPN सेवा प्रकार आढळले नाही."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "आयात करण्याजोगी फाइल नीवडा"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "हार्डवेअर"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "वर्च्युअल"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "साठविलेली VPN संरचना आयात करा..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "अपरिचीत त्रुटीमुळे जोडणी संपादक संवाद प्रारंभ करणे अशक्य."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "नवीन जोडणी निर्माण करणे अशक्य"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "जोडणी नष्ट करणे अपयशी"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "तुम्हाला नक्की जोडणी %s नष्ट करायची?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN जोडणी (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "पत्ता"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "नेटमास्क"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "गेटवे"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "मेट्रीक"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "प्रिफीक्स्"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s संपादीत करत आहे"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "विनावी जोडणी संपादीत करत आहे"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "जोडणी नाव (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "संपादक प्रारंभ करतेवेळी त्रुटी"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "जोडणी समावेश करणे अपयशी"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "जोडणी संपादकाला काहिक आवश्यक स्त्रोत आढळले नाही (.ui फाइल आढळले नाही)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "साठवा (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "या जोडणीकरीता कार्यान्वीत केलेले कुठलेही बदल साठवा."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "या मशीन वरील सर्व वापरकर्त्यांकरीता ही जोडणी साठवण्यासाठी ओळख पटवा."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "जोडणी निर्माण करणे अशक्य"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "जोडणी संपादीत करणे अशक्य"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "जोडणी संपादक संवाद निर्माण करतेवेळी त्रुटी आढळली."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "संपादक प्रारंभ करतेवेळी त्रुटी"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "जोडणी समावेश करणे अपयशी"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "जोडणी नाव (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "एक्सपोर्ट करा (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "लेबल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "लेबल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "कधिच नाही"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "आता"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d मिनीट पूर्वी"
 msgstr[1] "%d मिनीटं पूर्वी"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d तास पूर्वी"
 msgstr[1] "%d तास पूर्वी"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d दिवस पूर्वी"
 msgstr[1] "%d दिवसांपूर्वी"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d महिना पूर्वी"
 msgstr[1] "%d महिन्यांपूर्वी"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d वर्ष पूर्वी"
 msgstr[1] "%d वर्षांपूर्वी"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "जोडणी समावेश करणे अपयशी"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "वायर्ड जोडणी %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "वायर्ड जोडणी %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "नाव"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "शेवटच्यावेळी वापरले"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "नीवडलेली जोडणी संपादीत करा"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "नीवडलेली जोडणी संपादीत करण्याकरीता ओळख पटवा"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "नीवडलेली जोडणी नष्ट करा"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "नीवडलेली जोडणी नष्ट करण्याकरीता ओळख पटवा"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "असमर्थीत मोबाइल ब्रॉडबँड जोडणी प्रकार."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "नवीन '%s' जोडणी कसे निर्माण करायचे, ते माहिती नाही"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "जोडणी निर्माण करतेवेळी त्रुटी आढळली"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "जोडणी समावेश करणे अपयशी"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "नवीन '%s' जोडणी कसे निर्माण करायचे, ते माहिती नाही"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' सह जोडणी आढळली नाही"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "नेटवर्क जोडणी"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN जोडणी (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X सुरक्षा"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Wi-Fi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "या जोडणी करीता 802.1X सुरक्षा वापरा"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ब्ल्यूटूथ साधण आढळले नाही."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "वायर्ड जोडणी %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "नेटवर्क कार्यान्वीत करा (_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "वायरलेस "
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "बाँड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "पहिले DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "बाँड जोडणी %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "वायर्ड जोडणी %d"
@@ -3235,34 +3613,39 @@ msgstr "वायर्ड जोडणी %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "पॅरेंट संवाद (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL जोडणी %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3272,57 +3655,56 @@ msgstr ""
 "हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
 "करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "दुर्लक्ष केले"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "इथरनेट (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "क्लोंड MAC पत्ता (_C):"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "वायर्ड जोडणी %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "पूर्वनिर्धारीत"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3333,185 +3715,187 @@ msgstr ""
 "हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
 "करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "इंफिनिबँड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "इंफिनिबँड जोडणी %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "वायर्ड जोडणी %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "स्वयं (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "फक्त स्वयं (VPN) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "स्वयं, फत्त पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "स्वयं (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "फक्त स्वयं (PPPoE) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "स्वयं (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "फक्त स्वयं (DHCP) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "फक्त स्थानीयशी जुळवा"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "DNS सर्व्हर्स् (_D):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "क्षेत्र शोधा (_S):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s करीता IPv4 मार्ग संपादीत करत आहे"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 संयोजना"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "स्वयं, फक्त DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s करीता IPv6 राऊट्स् संपादीत करत आहे"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 सेटिंग्स्"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL जोडणी %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s स्लेव्ह %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "मोबाईल ब्रॉडबँड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "असमर्थीत मोबाइल ब्रॉडबँड जोडणी प्रकार."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "मोबाइल ब्रॉडबँड प्रोव्हइडर प्रकार नीवडा"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3520,7 +3904,7 @@ msgstr ""
 "मोबाईल ब्रॉडबँड प्रोव्हाइडर द्वारे वापरण्याजोगी विज्ञान नीवडा.  खात्री नसल्यास, "
 "प्रोव्हाइडरशी संपर्क साधा."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "माझे प्रोव्हाइडर GSM-आधारीत विज्ञानाचा (म्हणजेच GPRS, EDGE, UMTS, HSDPA) वापर "
@@ -3528,85 +3912,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "माझे प्रोव्हाइडर CDMA-आधारीत विज्ञानाचा (म्हणजेच 1xRTT, EVDO) वापर करतात (_D)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "काहिच नाही"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s करीता PPP ओळख पटवणे पद्धती संपादीत करत आहे"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP संयोजना"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "बाँड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "वायर्ड जोडणी %d"
@@ -3614,11 +3994,11 @@ msgstr "वायर्ड जोडणी %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
@@ -3626,59 +4006,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "नेटवर्क जोडणी आढळली नाही"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "IPv4 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN जोडणी %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN वापरकर्ता संवाद लोड करणे अशक्य."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' करीता VPN प्लगइन सेवा आढळली नाही."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' करीता VPN प्लगइन सेवा आढळली नाही."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "जोडणी समावेश करणे अपयशी"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' करीता VPN प्लगइन सेवा आढळली नाही."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN जोडणी %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN जोडणी प्रकार नीवडा"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3688,7 +4068,7 @@ msgstr ""
 "नवीन जोडणी करीता वापरण्याजोगी VPN चे प्रकार नीवडा.  पसंतीचे  VPN जोडणी यादीत न "
 "आढळल्यास, तुमच्याकडे योग्य VPN प्लगइन प्रतिष्ठापीत नसावे."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3697,7 +4077,7 @@ msgstr ""
 "येथील दिलेल्या BSSID द्वारे निर्देशीत वायरलेस ऍक्सेस् पॉईंट (AP) करीता हा पर्याय ही जोडणी "
 "कुलूपबंद करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3707,98 +4087,96 @@ msgstr ""
 "हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
 "करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "कुठलेही साधण"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "वायर्ड जोडणी %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-बीट कि (Hex किंवा ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit गोपनीयता"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "गतिक WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 खाजगी"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एन्टरप्राइज"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Wi-Fi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य; Wi-Fi संयोजना आढळली नाही."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "वायरलेस सुरक्षा"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" नामांकीत फाइल आधिपासूनच अस्तित्वात आहे."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "बदलवा (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "तुम्हाला %s ला साठविण्याजोगी VPN जोडणीशी बदलवायचे?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN जोडणीचे स्वरूप बदलवणे अशक्य"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3809,220 +4187,106 @@ msgstr ""
 "\n"
 "त्रुटी: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN जोडणीचे स्वरूप बदला..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "कुलूपबंद अशक्य करा (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "जोडणी माहिती"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "सक्रीय नेटवर्क जोडणी"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "प्राइव्हेट कि (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "तुमची मोबाईल ब्रॉडबँड जोडणी आत्ता खालील सेटिंग्स् सह संरचीत केले आहे:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "तुमचे साधण:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "तुमचे प्रोव्हाइडर:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "तुमचे प्लॅन:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"नीवडलेल्या सेटिंग्स् सह तुमच्या मोबाईल ब्रॉडबँड प्रोव्हाइडरसह जोडणी स्थापीत केली जाईल.  "
-"जोडणी अपयशी ठरल्यास किंवा नेटवर्क स्रोतकरीता प्रवेश प्राप्त न झाल्यस, सेटिंग्स् दोनवेळ "
-"तपासा.  मबाईल ब्रॉडबँड जोडणीच्या सेटिंग्स् संपादीत करण्यासाठी, System >> Preferences "
-"मेन्यू पासून \"Network Connections\" नीवडा."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "माझे देश सूचीत नाही"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "सूचीत नाही"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "तुमचे प्लॅन नीवडा (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "नीवडलेले प्लॅन APN (ऍक्सेस् पॉईंट नेम) (_A):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"सावधान: अयोग्य प्लॅन नीवडल्यास ब्रॉडबँड खातेकरीता बिलींग अडचणींकरीता कारणीभूत ठरू शकतात "
-"किंवा जोडणी टाळू शकतात.\n"
-"\n"
-"प्लॅन विषयी खात्री नसल्यास कृपया प्रोव्हाइडरला तुमच्या प्लॅन APN विषयी विचारा."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "तुमचे बिलींग प्लॅन नीवडा"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "माजे प्लॅन सूचीत नाही..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "सूचीतून प्रोव्हाइडर नीवडा (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "प्रोव्हाइडर"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "प्रोव्हाइडर:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "माझे प्रोव्हाइडर GSM विज्ञानाचा (GPRS, EDGE, UMTS, HSPA) वापर करते"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "माझे प्रोव्हाइडर CDMA विज्ञानचा (1xRTT, EVDO) वापर करते"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "आपली प्राइव्हेट कि नीवडा"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "देश किंवा प्रांताची सूची:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "देश किंवा प्रांत"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "माझे देश सूचीत नाही"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "प्रोव्हाइडरचे देश किंवा प्रांत नीवडा"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "प्रतिष्ठापीत GSM साधन"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "प्रतिष्ठापीत CDMA साधन"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "कुठलेही साधण"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4030,189 +4294,266 @@ msgstr ""
 "सहाय्यक तुम्हाला मोबाईल ब्रॉडबँड जोडणी सेल्यूलर (3G) नेटवर्ककरीता सेट अप करण्यास मदत "
 "करतो."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "तुम्हाला खालील माहितीची आवश्यकता आहे:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "तुमच्या ब्रॉडबँड प्रोव्हाइडरचे नवा"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "तुमच्या ब्रॉडबँड बिलींग प्लॅनचे नाव"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(काहिक घटनांमध्ये) तुमचे ब्रॉडबँड बिलींग प्लॅन APN (ऍक्सेस पॉईंट नेम)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "या मोबाइल ब्रॉडबँड साधण करीता जोडणी निर्माण करा (_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "कुठलेही साधण"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "मोबाइल ब्रॉडबँड जोडणी सेटअप करा"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "देश किंवा प्रांत"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "प्रोव्हाइडरचे देश किंवा प्रांत नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "सूचीतून प्रोव्हाइडर नीवडा (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "माझे प्रोव्हाइडर GSM विज्ञानाचा (GPRS, EDGE, UMTS, HSPA) वापर करते"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "माझे प्रोव्हाइडर CDMA विज्ञानचा (1xRTT, EVDO) वापर करते"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "आपली प्राइव्हेट कि नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "तुमचे प्लॅन नीवडा (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "नीवडलेले प्लॅन APN (ऍक्सेस् पॉईंट नेम) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"सावधान: अयोग्य प्लॅन नीवडल्यास ब्रॉडबँड खातेकरीता बिलींग अडचणींकरीता कारणीभूत ठरू शकतात "
+"किंवा जोडणी टाळू शकतात.\n"
+"\n"
+"प्लॅन विषयी खात्री नसल्यास कृपया प्रोव्हाइडरला तुमच्या प्लॅन APN विषयी विचारा."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "तुमचे बिलींग प्लॅन नीवडा"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "तुमची मोबाईल ब्रॉडबँड जोडणी आत्ता खालील सेटिंग्स् सह संरचीत केले आहे:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "तुमचे साधण:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "तुमचे प्रोव्हाइडर:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "तुमचे प्लॅन:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"नीवडलेल्या सेटिंग्स् सह तुमच्या मोबाईल ब्रॉडबँड प्रोव्हाइडरसह जोडणी स्थापीत केली जाईल.  "
+"जोडणी अपयशी ठरल्यास किंवा नेटवर्क स्रोतकरीता प्रवेश प्राप्त न झाल्यस, सेटिंग्स् दोनवेळ "
+"तपासा.  मबाईल ब्रॉडबँड जोडणीच्या सेटिंग्स् संपादीत करण्यासाठी, System >> Preferences "
+"मेन्यू पासून \"Network Connections\" नीवडा."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(काहिच नाही)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA प्रमाणपत्र (_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "अपरिचीत"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "कुलूपबंद अशक्य करा (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "प्रत्येकवेळी या पासवर्डकरीता विचारा (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s' शी जोडणी स्थापीत करण्याकरीता पासवर्ड आवश्यक आहे."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "पासवर्ड (_P):"
+msgid "Sh_ow passwords"
+msgstr "पासवर्डस् दाखवा (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "पासवर्ड (_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "पासवर्डस् दाखवा (_w)"
+msgid "_Secondary Password:"
+msgstr "पासवर्ड (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "पासवर्ड (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "जोडणी मोडा"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "काहीच नाही"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिक WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "बनवा (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4220,42 +4561,42 @@ msgstr ""
 "वायरलेस नेटवर्क '%s' करीता प्रवेश प्राप्त करण्यासाठी पासवर्ड किंवा एनक्रीपसन कि आवश्यक "
 "आहे."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "वायरलेस नेटवर्क ओळख पटवणे आवश्यक"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "वायरलेस नेटवर्क द्वारे ओळख पटवणे आवश्यक आहे"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "नवीन वायरलेस नेटवर्क बनवा"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "नवीन वायरलेस नेटवर्क"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "पसंतीचे वायरलेस नेटवर्क करीता नाव प्रविष्ट करा."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "लपविलेले वायरलेस नेटवर्क"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4264,37 +4605,55 @@ msgstr ""
 "पसंतीचे लपविलेले वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नाव व सुरक्षा तपशील प्रविष्ट "
 "करा."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "वायरलेस सुरक्षा (_W):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "जोडणी (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "वायरलेस अडॅप्टर (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "माझे प्रोव्हाइडर शोधणे शक्य नाही व मला स्वहस्ते द्यायचे आहे (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "प्रोव्हाइडर:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "देश किंवा प्रांताची सूची:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "देश किंवा प्रांत"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "वार्यर्ड"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4304,17 +4663,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "वायरलेस सुरक्षा (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "नेटवर्कचे नाव (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "जोडणी (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "वायरलेस अडॅप्टर (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "वापर:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4322,7 +4705,7 @@ msgstr ""
 "हे कार्यक्रम NetworkManager चे घटक आहे (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4330,420 +4713,467 @@ msgstr ""
 "हे आदेश-ओळ संवाद करीता लागू होत नाही परंतु त्याऐवजी GNOME डेस्कटॉप एन्वार्यनमेंट मध्ये "
 "चालवले जाते."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "सुरू केले नाही"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "नोंदणीकृत नाही"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "होम नेटवर्क (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "होम नेटवर्क"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "शोधत आहे"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "नोंदणी नकारली"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s रोमींग)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (रोमींग)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "रोमींग नेटवर्क (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "रोमींग नेटवर्क"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN कोड आवश्यक आहे"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "मोबाइल ब्रॉडबँड साधन करीता PIN कोड आवश्यक आहे"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "रोमींग"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "DSL जोडणी %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER किंवा PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, किंवा PKCS#12 वैयक्तिक किज् (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC फाइल पसंत करा..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC फाइल्स (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "सर्व फाइल्स"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "निनावी ओळख (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ओळख पटवा"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "निनावी ओळख (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
-msgstr ""
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
+msgstr "सर्व फाइल्स"
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "आंतरीक ओळख पटवा (_n):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "सर्टिफिकेट अथॉरिटि प्रमाणपत्र नीवडा..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "आवृत्ती 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "आवृत्ती 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA प्रमाणपत्र (_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "PEAP आवृत्ती (_P):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit गोपनीयता"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "पासवर्डस् दाखवा (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ओळख (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "टनल्ड् TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "प्रोटेक्टेड EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "ओळख पटवा (_A):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (पूर्वनिर्धारीत)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ओपन प्रणाली"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "शेअर्ड् कि"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (पूर्वनिर्धारीत)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "कि (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "कि दाखवा (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP इंडेक्स् (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "प्रकार (_T):"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (पूर्वनिर्धारीत)"
+
+#~ msgid "Ignored"
+#~ msgstr "दुर्लक्ष केले"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "अपरिचीत त्रुटीमुळे जोडणी गोपणीयता अद्ययावत करण्यास अपयशी."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "जोडणी विषयी माहिती (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN जोडणी आयात करणे अशक्य"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "फाइल '%s' वाचनजोगी नाही किंवा त्यात ओळखण्याजोगी VPN जोडणी माहिती समाविष्टीत "
+#~ "नाही\n"
+#~ "\n"
+#~ "त्रुटी: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "अपरिचीत"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "सर्टिफिकेट अथॉरिटि प्रमाणपत्र नीवडा..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA प्रमाणपत्र (_A):"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager ॲप्लेट"
 
@@ -4779,15 +5209,6 @@ msgstr "प्रकार (_T):"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "स्वमध्यस्थी (_o)"
 
@@ -4892,13 +5313,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "दुसरे DNS:"
-
-#~| msgid "Secondary DNS:"
-#~ msgid "Ternary DNS:"
-#~ msgstr "तिसरे DNS:"
-
 #~| msgid "Enable _Mobile Broadband"
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "WiMAX मोबाइल ब्रॉडबँड सुरू करा (_X)"
@@ -4964,12 +5378,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "A_vailable to all users"
 #~ msgstr "सर्व वापरकर्त्यांकरीता उपलब्ध"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "स्वयं जुळवा (_a)"
-
-#~ msgid "_Import"
-#~ msgstr "आयात करा (_I)"
-
 #~| msgid "Error displaying connection information:"
 #~ msgid "Error saving connection"
 #~ msgstr "जोडणी साठवतेवेळी त्रुटी"
@@ -5008,10 +5416,6 @@ msgstr "प्रकार (_T):"
 #~ msgid "Error: %s"
 #~ msgstr "त्रुटी: %s"
 
-#~| msgid "Could not create new connection"
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN जोडणी निर्माण करणे अशक्य: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "मोबाईल सहाय्यक रद्द केले"
 
diff --git a/po/ms.po b/po/ms.po
index e3983155..41fc667e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2011-11-14 13:25+0730\n"
 "Last-Translator: Umarzuki Bin Mochlis Moktar <umarzuki@gmail.com>\n"
 "Language-Team: Malay <gnome-ms@googlegroups.com>\n"
@@ -19,39 +20,48 @@ msgstr ""
 "X-Poedit-Language: Malay\n"
 "X-Poedit-Country: MALAYSIA\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rangkaian"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Urus sambungan-sambungan rangkaian anda"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Sambungan-sambungan Rangkaian"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Sambungan-sangbungan Rangkaian Aktif"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Urus dan pinda tetapan sambungan rangkaian anda"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila menyambung kepada "
 "rangkaian"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Lumpuhkan pemberitahuan apabila telah terputus"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -59,12 +69,12 @@ msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
 "rangkaian."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -73,11 +83,11 @@ msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
 "rangkaian."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Redam notifikasi rangkaian tersedia"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -85,21 +95,22 @@ msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila rangkaian wayarles "
 "boleh didapati."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Cop"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Diguna untuk menentukan sama ada tetapan sedia ada patut dipindahkan ke "
 "versi baharu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Lumpuhkan Cipta Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -107,162 +118,175 @@ msgstr ""
 "Set ke TRUE untuk mematikan penciptaan rangkaian Adhoc apabila menggunakan "
 "applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Pilih sijil CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Pengurus Rangkaian"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Tiada sambungan rangkaian"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Aplet NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Pengesahan 802.1X berwayar"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "S_ambung"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nama Rangkain:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Gagal mencipta sambungan PAN: %s"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "Tidak diketahui"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "Gagal menambah sambungan"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "terputus"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Terputus"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Gagal menambah sambungan"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Jangan paparkan mesej ini lagi"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -273,7 +297,7 @@ msgstr ""
 "Sambungan VPN '%s' terputus disebabkan oleh sambungan rangkaian telah "
 "diganggu."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -283,7 +307,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana terganggu."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -292,7 +316,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana servis VPN tiba-tiba terhenti. "
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -302,7 +326,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana servis VPN mempunyai konfigurasi tidak sah."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -311,7 +335,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana telah tamat masa menyambung."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -320,7 +344,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana servis VPN tidak dimulakan tepat pada masa."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -329,7 +353,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal keranan servis VPN gagal dimulakan."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -338,7 +362,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana tiada rahsia-rahsia VPN yang sah."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -347,7 +371,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal kerana rahsia-rahsia VPN tidak sah."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -356,7 +380,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -364,19 +388,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mesej Logmasuk VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Sambungan VPN Gagal"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -389,7 +413,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -402,576 +426,601 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "peranti tidak sedia (perisian tegar tiada)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "peranti belum bersedia"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "terputus"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Putuskan"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "peranti tidak diuruskan"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Tiada peranti rangkaian tersedia"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Sambungan _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Konfigur VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Sambungan _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager tidak berjalan..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Rangkaian dilumpuhkan"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Benarkan Ra_ngkaian"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Benarkan _Wayarles"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Benarkan Jalurlebar _Mudahalih"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Benarkan _Pemberitahuan"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Maklumat Sambungan"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Edit Sambungan..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Mengenai"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Anda sekarang sambung ke '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Terputus"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Sambungan rangkaian telah diputuskan."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Menyediakan sambungan rangkaian '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Pengesahan pengguna diperlukan untuk sambungan rangkaian '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Meminta alamat rangkaian untuk '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Sambungan rangkaian '%s' aktif"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Memulakan sambungan VPN '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Pengesahan pengguna diperlukan untuk sambungan VPN '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Meminta satu alamat VPN untuk '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Sambungan VPN '%s' aktif"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Tiada sambungan rangkaian"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Kod PUK salah; sila hubungi pembekal peranti."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Kod PIN salah; sila hubungi pembekal peranti."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Menghantar kod membuka kunci..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Jalurlebar Mudahalih (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Jalurlebar Mudahalih"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tersedia"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Sambungan Baharu Jalurlebar Mudahalih"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Sambungan Ditubuhkan"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Anda telah tersambung ke rangkaian jalurlebar mudahalih."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Kata laluan rangkaian jalurlebar mudahalih "
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Anda telah didaftarkan pada rangkaian rumah."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Anda telah didaftarkan pada rangkaian perantauan."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Anda telah tersambung ke rangkaian jalurlebar mudahalih."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Menyediakan sambungan jalurlebar mudahalih '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Mengkonfigurasi sambungan jalurlebar mudahalih '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Pengesahan pengguna diperlukan untuk sambungan jalurlebar mudahalih '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Sambungan jalurlebar mudahalih '%s' aktif"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet Automatik"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Rangkaian-rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Rangkaian-rangkaian Berwayar"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Rangkaian Berwayar"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Anda telah tersambung ke rangkaian berwayar."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Menyediakan sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Mengkonfigur sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Pengesahan pengguna diperlukan untuk sambungan rangkaian berwayar '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Meminta alamat untuk rangkaian berwayar '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Sambungan rangkaian '%s' aktif"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Pengesahan DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Cipta Sambungan Wayarles Baharu"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(tiada)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Tidak dapat menyunting rangkaian baharu"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Rangkaian-rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rangkaian Berwayar"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX dilumpuhkan"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX dilumpuhkan oleh suis perkakasan"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Lagi rangkaian-rangkain"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Rangkaian Wayarles Tersedia"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Guna menu rangkaian utuk sambung ke rangkaian wayarles"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Anda telah tersambung ke rangkaian wayarles '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Menyediakan sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Mengkonfigur sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Pengesahan pengguna diperlukan untuk rangkaian wayarles '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Meminta alamat rangkaian untuk '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Sambungan rangkaian wayarles '%s' aktif: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Sambungan rangkaian '%s' aktif"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Gagal mencipta sambungan PAN: %s"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Ralat memaparkan maklumat sambungan:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP Dinamik"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Alamat-alamat"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Tiada"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (Piawai)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Alamat IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Alamat Siar"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Tapisan Subrangkaian"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS Utama:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS Kedua:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS Ketiga:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Am"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Antaramuka"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Alamat Perkakasan"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Pemacu"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Kelajuan"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Keselamatan:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Pelayan Route"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Diabaikan"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Katalaluan:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Jenis VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Get laluan VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Namapengguna VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Banner VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Sambungan Asas"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Tiada sambungan aktif yang sah ditemui!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -980,18 +1029,22 @@ msgstr ""
 "dan ramai lagi penyumbang-pemyumbang dari komuniti dan penterjemah-"
 "penterjemah"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Kawasan aplet notifikasi untuk menguruskan peranti-peranti rangkaian anda "
 "dan sambungan."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Laman sesawang NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -999,33 +1052,33 @@ msgstr ""
 "Aplet NetworkManager tidak dapat mencari beberapa sumber-sumber yang "
 "diperlukan (fail .ui tidak dijumpai)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Sumber-sumber hilang"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Kata laluan rangkaian jalurlebar mudahalih "
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Kata laluan diperlukan untuk sambung ke '%s'."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "PIN nyahkunci SIM diperlukan"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "PIN Nyahkunci SIM Diperlukan"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1035,25 +1088,25 @@ msgstr ""
 "digunakan."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Kod PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Tunjuk kod PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "PUK nyahkunci SIM diperlukan"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "PUK Nyahkunci SIM Diperlukan"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1063,35 +1116,42 @@ msgstr ""
 "digunakan."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Kod PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "PIN kod baru:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Masukkan semula kod PIN baharu:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Tunjukkan kod-kod 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Maklumat Sambungan"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Gagal mencipta sambungan DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1100,42 +1160,42 @@ msgstr ""
 "Alamat-alamat IP mengenalpasti komputer anda pada rangkaian. Klik butang "
 "\"Tambah\" untuk menambah alamat IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Padam"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Abaikan route-route yang didapatkan secara automatik"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Guna s_ambungan ini hanya untuk sumber pada rangkaian terbabit"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1143,17 +1203,17 @@ msgstr ""
 "Jika dipasang, sambungan ini tidak akan digunakan sebagai sambungan "
 "rangkaian lalai."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Cipta..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Pilih Satu Jenis Sambungan VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1165,213 +1225,272 @@ msgstr ""
 "sambungan VPN anda mahu mencipta tidak muncul dalam senarai, anda mungkin "
 "tidak mempunyai plugin VPN yang betul dipasang."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Servis:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Alamat Siar:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Sambungan Asas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_od:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Antaramuka:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "DNS Utama:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_Keselamatan:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Sambungan Asas:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Benarkan Ra_ngkaian"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatik"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "piawai"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1382,440 +1501,530 @@ msgstr ""
 "untuk peranti rangkaian hubungan ini diaktifkan. Ciri ini dikenali sebagai "
 "MAC pengklonan atau menipu. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Alamat Perkakasan:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Mana-mana peranti"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Gagal mengemaskini rahsia-rahsia sambungan disebabkan ralat yang tidak "
-"diketahui."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Guna sekuriti 802.1X untuk sambungan ini"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Namapengguna:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servis:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Tunjuk katalaluan"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Katalaluan:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Antaramuka"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Antaramuka:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Antaramuka:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Pasangan Terpiuh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Abai"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "_Liang:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Servis:"
+msgid "_Port"
+msgstr "_Liang:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Alamat MAC _Diklon:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Katalaluan Kunci Persendirian:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Piawai"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Abai"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Alamat Siar:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Katalaluan Kunci Persendirian:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Kelajuan:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Duplek_s penuh"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Tiada"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Anda telah tersambung ke rangkaian berwayar."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Automatik kunci peranti ini"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Maklumat Sambungan"
+msgid "_Metered connection"
+msgstr "Sambungan Asas:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Sambung secara _automatik"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1824,7 +2033,7 @@ msgstr ""
 "Alamat-alamat IP mengenalpasti komputer anda pada rangkaian. Klik butang "
 "\"Tambah\" untuk menambah alamat IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1832,128 +2041,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatik, alamat sahaja"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Alamat-alamat"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "S_ambung"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_Servis:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatik dengan tetapan DNS manual"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Pautan-Lokal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Dikongsi dengan komputer lain"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Kaedah:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1964,8 +2176,8 @@ msgstr ""
 "konfigurasi komputer anda. Jika anda mahu menggunakan pengecam klient DHCP, "
 "masukkan di sini."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1973,26 +2185,26 @@ msgstr ""
 "Domain-domain digunakan untuk menyelesaikan nama-nama hos. Guna koma untuk "
 "memisahkan domain-domain yang pelbagai."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID klien D_HCP:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "_Cari domain:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_Pelayan-pelayan DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2000,12 +2212,12 @@ msgstr ""
 "Alamat IP pelayan nama domain yang digunakan untuk menyelesaikan nama hos. "
 "Gunakan koma untuk mengasingkan alamat nama domain pelayan berbilang."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Memerlukan alamat IPv4 untuk sambungan ini disempurnakan"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2013,25 +2225,34 @@ msgstr ""
 "Apabila menyambung kepada rangkaian IPv6-mampu, membolehkan sambungan untuk "
 "melengkapkan jika IPv4 konfigurasi gagal tetapi konfigurasi IPv6 berjaya."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Dilumpuhkan"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2041,16 +2262,20 @@ msgstr ""
 "Alamat IP pelayan nama domain yang digunakan untuk menyelesaikan nama hos. "
 "Gunakan koma untuk mengasingkan alamat nama domain pelayan berbilang."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Memerlukan alamat IPv6 untuk sambungan ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2058,752 +2283,853 @@ msgstr ""
 "Apabila menyambung kepada rangkaian IPv4-mampu, membolehkan sambungan untuk "
 "melengkapkan jika konfigurasi IPv6 gagal tetapi IPv4 konfigurasi berjaya."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrik"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Import"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Asas"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "No_mbor:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Lanjutan"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID Ra_ngkaian:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Tukar..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Benarkan perantauan jika rangkaian rumah tidak tersedia"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Tunjuk katalaluan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Pengesahan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Kaedah-kaedah dibenarkan:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Kaedah _Konfigur..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Pemampatan"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Guna enkripsi point-to-point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Memerlukan enkripsi 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Guna MPPE stateful"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Benarkan pemampatan data _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Benarkan _Mengempis pemampatan data"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Guna _pemampatan pengepala TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Gema"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Hantar peket-peket g_ema PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Kaedah:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Tiada"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Kaedah:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Lanjutan"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Rangkaian-rangkaian Berwayar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Keselamatan:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Keselamatan:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Keselamatan:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_Kekunci peribadi"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Antaramuka:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Keselamatan:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Sambungan Asas:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet Automatik"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Alamat Perkakasan:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Alamat Perkakasan:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Keselamatan:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Kuasa Trans_misi:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Kuasa Trans_misi:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Antaramuka:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Antaramuka:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Alamat MAC _Diklon:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Keselamatan:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Kuasa Trans_misi:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Kadar:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Salura_n:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "J_alur:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Kaedah-kaedah Pengesahan Yang Dibenarkan"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Protokol Pengesahan Boleh Perluas"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokol Pengesahan Katalaluan"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol Pengesahan Handshake Challange"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protokol Pengesahan Handshake Microsoft Challange"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Protokol Pengesahan Handshake Microsoft Challange versi 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2813,112 +3139,100 @@ msgstr ""
 "pengesahan. Jika sambungan gagal, cuba melumpuhkan sokongan untuk beberapa "
 "kaedah."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Plugin VPN gagal untuk mengimport sambungan VPN betul \n"
-"\n"
-"Ralat: tiada jenis perkhidmatan VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Tidak dapat mengimport sambungan VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Fail '%s' tidak dapat dibaca atau tidak mengandungi maklumat VPN yang dapat "
-"dikenalpasti\n"
+"Plugin VPN gagal untuk mengimport sambungan VPN betul \n"
 "\n"
-"Ralat: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "tidak diketahui"
+"Ralat: tiada jenis perkhidmatan VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Pilih fail untuk diimport"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Alamat Perkakasan:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Eksport sambungan VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2926,79 +3240,86 @@ msgstr ""
 "Dialog penyunting sambungan tidak dapat dimulakan kerana ralat yang tidak "
 "diketahui."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Tidak dapat mencipta sambungan baharu"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Gagal memadam sambungan"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Anda pasti hendak membuang sambungan %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Sambungan _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Topeng Internet"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Get laluan"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Awalan"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Menyunting %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Menyunting sambungan yang tidak dinamakan"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Nama _sambungan:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Ralat memulakan penyunting"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Gagal menambah sambungan"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3006,254 +3327,297 @@ msgstr ""
 "Editor sambungan tidak dapat mencari beberapa sumber yang diperlukan (fail. "
 "Ui adalah tidak dijumpai)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Simpan sebarang perubahan yang telah dibuat pada sambungan ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Sahkan untuk menyimpan sambungan ini bagi semua pengguna pada komputer ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Tidak dapat mencipta sambungan baharu"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Tidak dapat menyunting rangkaian"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ralat mencipta dialog penyunting sambungan."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Ralat memulakan penyunting"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Gagal menambah sambungan"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Nama _sambungan:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_ksport"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "label"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "label"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "jangan sesekali"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "sekarang"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minit yang lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d jam yang lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d hari yang lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d bulan yang lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d tahun yang lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Gagal menambah sambungan"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Sambungan berwayar %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Sambungan berwayar %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nama"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Kali Terakhir Digunakan"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Sunting sambungan dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Sahkan untuk menyunting sambungan dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Padam sambungan yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Sahkan untuk memadam sambungan dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Jenis sambungan jalurlebar mudahalih Tidak disokong."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Tidak tahu bagaimana mencipta sambungan-sambungan '%s'"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Ralat semasa menyunting sambungan"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Ralat mencipta sambungan"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Gagal menambah sambungan"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Tidak tahu bagaimana mencipta sambungan-sambungan '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Ralat semasa menyunting sambungan"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Tidak menjumpai sambungan dengan UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Sambungan-sambungan Rangkaian"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Sambungan _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Keselamatan 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna keselamatan Wi-Fi."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Guna sekuriti 802.1X untuk sambungan ini"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "tidak dapat mencari peranti Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Sambungan berwayar %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Benarkan Ra_ngkaian"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Rangkaian Wayarles"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS Utama:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Sambungan berwayar %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Sambungan berwayar %d"
@@ -3261,34 +3625,39 @@ msgstr "Sambungan berwayar %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Antaramuka:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Sambungan DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3298,57 +3667,56 @@ msgstr ""
 "Pilihan ini mengunci ini sambungan ke peranti rangkaian yang dinyatakan oleh "
 "alamat MAC tetap masuk di sini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Diabaikan"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Alamat MAC _Diklon:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Sambungan berwayar %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Piawai"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3359,186 +3727,188 @@ msgstr ""
 "Pilihan ini mengunci ini sambungan ke peranti rangkaian yang dinyatakan oleh "
 "alamat MAC tetap masuk di sini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna Wi-Fi."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Sambungan berwayar %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Sambungan berwayar %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Alamat-alamat automatik (VPN) sahaja "
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatik, alamat sahaja"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Alamat-alamat (PPoE) automatik sahaja"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Alamat automatik (DHCP) sahaja"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Pautan-Lokal Sahaja"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_Pelayan-pelayan DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_Cari domain:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Menyunting route IPv4 untuk %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Tetapan IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatik, DHCP sahaja"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Menyunting route IPv6 untuk %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Tetapan IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna DSL."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Sambungan DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Tidak dapat memuatkan "
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Jenis sambungan jalurlebar mudahalih Tidak disokong."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pilih Jenis Pembekal Jalurlebar Mudahalih"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3547,7 +3917,7 @@ msgstr ""
 "Pilih teknologi pembekal jalur lebar mudah alih anda menggunakan. Jika anda "
 "tidak pasti, tanya pembekal anda."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Pembekal saya menggunakan teknologi berasaskan _GSM-(iaitu GPRS, EDGE, UMTS, "
@@ -3555,85 +3925,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Pembekal saya menggunakan teknologi berasaskan C_DMA (iaitu 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "tiada"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Menyunting kaedah pengesahan PPP untuk %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Tetapan PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Sambungan berwayar %d"
@@ -3641,11 +4007,11 @@ msgstr "Sambungan berwayar %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
@@ -3653,59 +4019,59 @@ msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Tiada sambungan rangkaian"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Tidak dapat jumpa pemalam servis VPN untuk '%s'."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Tidak dapat jumpa pemalam servis VPN untuk '%s'."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Gagal menambah sambungan"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Tidak dapat jumpa pemalam servis VPN untuk '%s'."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Pilih Satu Jenis Sambungan VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3716,7 +4082,7 @@ msgstr ""
 "sambungan VPN anda mahu mencipta tidak muncul dalam senarai, anda mungkin "
 "tidak mempunyai plugin VPN yang betul dipasang."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3725,7 +4091,7 @@ msgstr ""
 "Pilihan ini mengunci ini sambungan ke pusat akses tanpa wayar (AP) yang "
 "dinyatakan oleh BSSID itu memasuki di sini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3735,102 +4101,100 @@ msgstr ""
 "Pilihan ini mengunci ini sambungan ke peranti rangkaian yang dinyatakan oleh "
 "alamat MAC tetap masuk di sini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Mana-mana peranti"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Sambungan berwayar %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kunci WEP 40/128-bit (Hex atau ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasalaluan WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP (802.1X) Dinamik"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Peribadi"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Perusahaan"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Tidak dapat memuatkan antaramuka keselamatan pengguna Wi-Fi; tetapan Wi-Fi "
 "hilang."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Sekuriti Wayarles"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna keselamatan Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Fail dengan nama \"%s\" sudah wujud."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Ganti"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Adakah anda ingin menggantikan %s dengan sambungan VPN yang anda hendak "
 "simpan?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Tidak dapat mengeksport sambungan VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3841,416 +4205,379 @@ msgstr ""
 "\n"
 "Ralat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Eksport sambungan VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Buka k_unci"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automatik kunci peranti ini"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Maklumat Sambungan"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Sambungan-sangbungan Rangkaian Aktif"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Sijil C_A"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Pilih sijil peribadi anda..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Kekunci peribadi"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Katalaluan Kunci Persendirian:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Pilih sijil peribadi anda..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Sijil pengesahan pengguna:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Sambungan jalurlebar mudahalih anda dikonfigurasi dengan tetapan-tetapan "
-"berikut:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Negara saya tidak tersenarai"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Peranti Anda:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr "Tidak tersenarai"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Pengendali Anda:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Plan saya tidak disenaraikan..."
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Plan Anda:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "Pengendali"
 
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Sambungan kini akan dibuat kepada pembekal jalur lebar mudah alih anda "
-"menggunakan tetapan yang anda pilih. Jika sambungan gagal atau anda tidak "
-"boleh mengakses sumber-sumber rangkaian, periksa tetapan anda. Untuk "
-"mengubah suai tetapan sambungan jalur lebar mudah alih anda, pilih "
-"\"Sambungan Rangkaian \" daripada Sistem>> Pilihan menu."
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "Terpasang peranti GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Sahkan Tetapan Jalurlebar Mudahalih"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "Terpasang peranti CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
-msgstr "Tidak tersenarai"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Mana-mana peranti"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Pilih plan anda:"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Sambungan Baharu Jalurlebar Mudahalih"
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Memilih pelan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Pembantu ini membantu anda untuk menetapkan sambungan broadban mudah alih ke "
+"rangkaian selular (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "Anda akan memerlukan maklumat berikut:"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
-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 "Your broadband provider’s name"
+msgstr "Nama pembekal jalurlebar anda"
+
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr "Nama pelan bil jalurlebar anda"
+
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
-"Amaran: Memilih plan yang salah boleh menyebabkan masalah bil akaun jalur "
-"lebar atau menghalang sambungan .\n"
-"\n"
-"Jika anda tidak pasti sila tanya pembekal plan APN anda."
+"(dalam sesetengah kes) Pelan bil APN (Access Point Name) jalurlebar anda"
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Pilih Pelan Bil Anda"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Cipta satu sambungan untuk peranti jalurlebar mudah alih _ini:"
+
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Tetapkan satu Sambungan Jalurlebar"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.ui:189
 #, fuzzy
-msgid "My plan is not listed…"
-msgstr "Plan saya tidak disenaraikan..."
+msgid "Country or region:"
+msgstr "Negara atau kawasan"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Plih Negara Pembekal anda atau Kawasan"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Pilih pembekal anda dari _senarai:"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-msgstr "Pengendali"
-
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
-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 set up the connection _manually:"
 msgstr ""
 "Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
 "secara _manual:"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Pengendali:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Pembekal saya menggunakan teknoloji GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Pembekal saya menggunakan teknoloji CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pilih pengendali anda"
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Senarai Negara atau Kawasan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Negara atau kawasan"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Pilih plan anda:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Negara saya tidak tersenarai"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Memilih pelan _APN (Access Point Name):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Plih Negara Pembekal anda atau Kawasan"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "Terpasang peranti GSM"
+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."
+msgstr ""
+"Amaran: Memilih plan yang salah boleh menyebabkan masalah bil akaun jalur "
+"lebar atau menghalang sambungan .\n"
+"\n"
+"Jika anda tidak pasti sila tanya pembekal plan APN anda."
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "Terpasang peranti CDMA"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Pilih Pelan Bil Anda"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
-"Pembantu ini membantu anda untuk menetapkan sambungan broadban mudah alih ke "
-"rangkaian selular (3G)."
+"Sambungan jalurlebar mudahalih anda dikonfigurasi dengan tetapan-tetapan "
+"berikut:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "Anda akan memerlukan maklumat berikut:"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Peranti Anda:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-#, fuzzy
-msgid "Your broadband provider’s name"
-msgstr "Nama pembekal jalurlebar anda"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Pengendali Anda:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr "Nama pelan bil jalurlebar anda"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Plan Anda:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
 msgstr ""
-"(dalam sesetengah kes) Pelan bil APN (Access Point Name) jalurlebar anda"
-
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "Cipta satu sambungan untuk peranti jalurlebar mudah alih _ini:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Mana-mana peranti"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
-msgstr "Tetapkan satu Sambungan Jalurlebar"
+"Sambungan kini akan dibuat kepada pembekal jalur lebar mudah alih anda "
+"menggunakan tetapan yang anda pilih. Jika sambungan gagal atau anda tidak "
+"boleh mengakses sumber-sumber rangkaian, periksa tetapan anda. Untuk "
+"mengubah suai tetapan sambungan jalur lebar mudah alih anda, pilih "
+"\"Sambungan Rangkaian \" daripada Sistem>> Pilihan menu."
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Sambungan Baharu Jalurlebar Mudahalih"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Sahkan Tetapan Jalurlebar Mudahalih"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(tiada)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Sijil C_A"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Tidak diketahui"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Pilih sijil peribadi anda..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Sijil pengesahan pengguna:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Ralat semasa menyunting sambungan"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "Buka k_unci"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Tanya kata laluan ini setiap kali"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Kata laluan diperlukan untuk sambung ke '%s'."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Katalaluan:"
+msgid "Sh_ow passwords"
+msgstr "_Tunjuk katalaluan"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Katalaluan:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_Tunjuk katalaluan"
+msgid "_Secondary Password:"
+msgstr "_Katalaluan:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Katalaluan:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Putuskan"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tiada"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP (802.1X) Dinamik"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_ipta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4258,42 +4585,42 @@ msgstr ""
 "Kata laluan atau kunci penyulitan diperlukan untuk mengakses rangkaian tanpa "
 "wayar '% s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Pengesahan Rangkaian Wayarles Diperlukan"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Pengesahan diperlukan oleh rangkaian wayarles"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Cipta Sambungan Wayarles Baharu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rangkaian wayarles baharu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Masukkan nama untuk rangkaian wayarles yang anda mahu buat."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rangkaian wayarles tersembunyi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4302,37 +4629,57 @@ msgstr ""
 "Masukkan nama dan perincian keselamatan rangkaian tanpa wayar yang "
 "tersembunyi yang anda ingin sambungkan ke."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "Sekuriti _wayarles"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "S_ambungan:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Penyesuai w_ayarles:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
+"secara _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Pengendali:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Senarai Negara atau Kawasan:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Negara atau kawasan"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Berwayar"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4342,17 +4689,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Sekuriti _wayarles"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nama Rangkain:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "S_ambungan:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Penyesuai w_ayarles:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Pengunaan:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4360,7 +4731,7 @@ msgstr ""
 "Program ini adalah komponen NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4368,420 +4739,468 @@ msgstr ""
 "Ia tidak bertujuan untuk interaksi baris arahan, tetapi sebaliknya berjalan "
 "dalam persekitaran desktop GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "tidak dihidupkan"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "tidak didaftarkan"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rangkaian rumah (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Rangkaian rumah"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "mencari"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "pendaftaran dinafikan"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s merantau)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (merantau)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rangkaian perantaun (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rangkaian perantaun"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Kod PIN untuk kad SIM '%s' on '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Kod PIN diperlukan"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Kod PIN diperlukan untuk peranti jalurlebar mudahalih"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Sambungan jalurlebar mudahalih '%s' aktif: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "merantau"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Sambungan Asas:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Sijil-sijil DER atau PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Kekunci peribadi DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Sijil C_A"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_Identiti tidak diketahui:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Pengesahan"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Identiti tidak diketahui:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Pengesahan Dalaman:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Pilih sijil Penguasa Sijil..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versi 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Sijil C_A"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Sijil C_A"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "_PEAP versi:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Frasalaluan WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Tunjuk katalaluan"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Sijil C_A"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Sijil C_A"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentiti:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Terowong TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Terlindung (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "_Pengesahan:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Piawai)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem Terbuka"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Kunci Dikongsi"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Piawai)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Kekunci"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "T_unjuk Kunci"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Inde_x WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Jenis:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (Piawai)"
+
+#~ msgid "Ignored"
+#~ msgstr "Diabaikan"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Gagal mengemaskini rahsia-rahsia sambungan disebabkan ralat yang tidak "
+#~ "diketahui."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Maklumat Sambungan"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Tidak dapat mengimport sambungan VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Fail '%s' tidak dapat dibaca atau tidak mengandungi maklumat VPN yang "
+#~ "dapat dikenalpasti\n"
+#~ "\n"
+#~ "Ralat: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "tidak diketahui"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Pilih sijil Penguasa Sijil..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Sijil C_A"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Pengurus Rangkaian"
 
@@ -4817,15 +5236,6 @@ msgstr "_Jenis:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Runding aut_o"
 
@@ -4929,12 +5339,6 @@ msgstr "_Jenis:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS Kedua:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS Ketiga:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Benarkan Jalurlebar Mudahalih WiMA_X"
 
@@ -4990,12 +5394,6 @@ msgstr "_Jenis:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Tersedia untuk semua pengguna"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Sambung secara _automatik"
-
-#~ msgid "_Import"
-#~ msgstr "_Import"
-
 #~ msgid "Error saving connection"
 #~ msgstr "Ralat menyimpan sambungan"
 
@@ -5030,9 +5428,6 @@ msgstr "_Jenis:"
 #~ msgid "Error: %s"
 #~ msgstr "Ralat: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Gagal mencipta sambungan DUN: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "Bestari Mudahalih dibatalkan"
 
diff --git a/po/nb.po b/po/nb.po
index 7fde6e27..c41181c3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 1.1.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2015-02-11 19:39+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -18,47 +19,56 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Håndter dine nettverksforbindelser"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Nettverkstilkoblinger"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktive nettverkstilkoblinger"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Håndter og endre innstillinger for nettverksforbindelser"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Slå av varsling om tilkobling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Sett denne til «true» For å slå av varsling ved tilkobling til et nettverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Slå av varsling om frakobling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Sett denne til «true» for å slå av varsling ved frakobling fra et nettverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Slå av varsling om VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -66,51 +76,52 @@ msgstr ""
 "Sett denne til true for å slå av varsling ved til- eller frakobling fra et "
 "VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Slå av varsling om tilgjengelige nettverk"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Sett denne til true for å slå av varsling når Wi-Fi-nettverk er "
 "tilgjengelige."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stempel"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Brukes til å bestemme om innstillingene skal migreres til en ny versjon."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Slå av oppretting av Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Sett til true for å slå av oppretting av ad-hoc nettverk når panelprogrammet "
 "brukes."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Vis panelprogrammet i varslingsområdet"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Sett til FALSE for å slå av visning av panelprogrammet i varslingsområdet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Overse CA-sertifikat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -118,7 +129,7 @@ msgstr ""
 "Sett denne til «true» for å slå av advarsler om CA-sertifikater med EAP-"
 "autentisering."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -126,130 +137,143 @@ msgstr ""
 "Sett denne til «true» for å slå av advarsler om CA-sertifikater i fase 2 av "
 "EAP-autentisering."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager panelprogram"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager panelprogram"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nettverksnavn:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Kunne ikke å legge til/slå på tilkobling"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Feil med tilkobling"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Frakobling av enhet feilet"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Feil ved frakobling"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivering av tilkobling feilet"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -259,7 +283,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» ble koblet fra fordi nettverkstilkoblingen ble avbrutt."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi nettverksforbindelsen ble avbrutt."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten stoppet uventet."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -289,7 +313,7 @@ msgstr ""
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten returnerte ugyldig "
 "konfigurasjon."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga tidsavbrudd for tilkoblingsforsøket."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke startet i tide."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -316,7 +340,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke klarte å starte opp."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi det ikke finnes gyldige VPN-passord."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga ugyldig hemmelighet for VPN."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -354,19 +378,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Etablering av VPN-tilkobling er fullført.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-tilkobling feilet"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -379,7 +403,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -392,610 +416,638 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "enheten er ikke klar (fastvare mangler)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "enheten er ikke klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "frakoblet"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "enheten er ikke håndtert"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Ingen nettverksenheter tilgjengelig"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Sett opp VPN …"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager kjører ikke …"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Slå på _nettverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Slå på _trådløst"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Slå på _mobilt bredbånd"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Slå på _varsling"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Rediger tilkoblinger …"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Du er nå koblet til «%s»."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Nettverksforbindelsen har blitt frakoblet."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Forbereder nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Brukerautentisering kreves for nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Ber om en nettverksadresse for «%s» …"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Starter VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Ber om en nettverksadresse på VPN for «%s» …"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Feil PUK-kode. Vennligst kontakt leverandøren."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Feil PIN-kode. Vennligst kontakt leverandøren."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Send kode for å låse opp …"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tilgjengelige"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Ny mobil bredbåndstilkobling"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Tilkoblingen er satt opp"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Du er nå registrert på hjemmenettverket."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Du er nå registrert på et roaming nettverk."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Forbereder mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Konfigurerer mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Brukerautentisering kreves for mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet-nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet-nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet-nettverk"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet-nettverk"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Du er nå koblet til ethernet-nettverket."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Forbereder ethernet-nettverkstilkobling til «%s» …"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Konfigurerer ethernet-nettverkstilkobling til «%s» …"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Brukeraautentisering kreves av ethernet-nettverksforbindelse «%s» …"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ber om en nettverksadresse på ethernet-nettverk for «%s» …"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ethernet-nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Klarte ikke å legge til ny tilkobling"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi-nettverk"
 msgstr[1] "Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi er slått av"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi er slått av med bryter"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Flere nettverk"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi-nettverk er tilgjengelige"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Bruk nettverksmenyen for å koble til et Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Du er nå koblet til Wi-Fi-nettverk «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Forbereder Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigurerer Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Brukerautentisering kreves for Wi-Fi-nettverk «%s» …"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Ber om en Wi-Fi-nettverksadresse for «%s» …"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi-nettverkstilkobling «%s» er aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi-nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Kunne ikke å aktivere tilkobling"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresser"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (forvalg)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Kringkastingsadresse"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnettmaske"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primær:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Sekundært passord:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Sikkerhet:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Forvalgt rute"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorert"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Type VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-gateway"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Brukernavn for VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-topptekst"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Grunntilkobling"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive tilkoblinger funnet!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Opphavsrett © 2004-2011 Red Hat, Inc.\n"
 "Opphavsrett © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Panelprogram for håndtering av dine nettverksenheter og -tilkoblinger."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager nettsted"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 "NetworkManager fant ikke nødvendige ressurser (.ui-filen ble ikke funnet)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Mangler ressurser"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Passord for tilkoblign med mobilt bredbånd"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Du må låse opp PIN-koden for SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Du må låse opp PIN-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1056,25 @@ msgstr ""
 "Mobil bredbåndsenhet «%s» krever en PIN-kode for SIM før den kan brukes."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1031,35 +1083,42 @@ msgstr ""
 "Mobil bredbåndsenhet «%s» krever en PUK-kode for SIM før den kan brukes."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Tast inn ny PIN-kode igjen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Tilkoblingsinformasjon"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Kunne ikke lage en DUN-tilkobling: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1068,41 +1127,41 @@ msgstr ""
 "IP-adresser identifiserer din datamaskin på nettverket. Klikk på «Legg til»-"
 "knappen for å legge til en IP-adresse."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Overse automatisk i_nnhentede ruter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Br_uk denne tilkoblingen kun for ressurser på sitt nettverk"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1110,16 +1169,16 @@ msgstr ""
 "Hvis dette slås på vil tilkoblingen aldri bli brukt som forvalgt "
 "nettverkstilkobling."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Lag …"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Velg type tilkobling"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1131,85 +1190,100 @@ msgstr ""
 "Hvis du lager en VPN-tilkobling og du ikke finner riktig type VPN-tilkobling "
 "i listen er det mulig at du ikke har korrekt VPN-tillegg installert."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Tjene_ste:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Tilfeldig"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktiv reserve"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Kringkasting"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Lastbalansering med tilpasset overføring"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Tilpasset lastbalansering"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (anbefalt)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Sammenkoblede _tilkoblinger:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_odus:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Overvåkings_frekvens:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Navn på grensesn_itt:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Overvåking av ti_lkobling:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP-_mål:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1217,19 +1291,22 @@ msgstr ""
 "En IP-adresse eller en kommaseparert liste med IP-adresser som skal sjekkes "
 "når tilkoblingsstatus sjekkes."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Pause før tilkoblingen tas _opp:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Pause før tilkoblingen tas ne_d:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primær:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1237,105 +1314,163 @@ msgstr ""
 "Navn på grensesnitt på primær enhet. Hvis denne er satt så vil enheten "
 "alltid være aktiv slave når den er tilgjengelig."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Kostnad for sti:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hårnålmodus:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Sammenkoblede _tilkoblinger:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "_Pause før videresending:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Tid for _hallo:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Slå på _nettverk"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Slå på _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Maksimal alder:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Aldringstid:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "forvalg"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Slå på"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1346,437 +1481,537 @@ msgstr ""
 "nettverksenheten denne tilkoblingen aktiveres på. Funksjonen er kjent som "
 "MAC-kloning. F.eks: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Navn på VLAN-grensesnitt:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Enhver enhet"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Klarte ikke å oppdatere hemmelighet for tilkobling på grunn av en ukjent "
-"feil."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Bruk datasenterbro (DCB) for denne tilkoblingen"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Flytkontroll"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funksjon"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Annonser"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Villig"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Alternativer …"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioritetsgrupper"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioritetsflytkontroll"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 #, fuzzy
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "Slå på eller av "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioritet:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Trafikk-klasse:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Streng båndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Prioritetsbåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Gruppebåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Gruppe-ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Br_ukernavn:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "Tjene_ste:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Vis passord"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Passord:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Grensesnitt"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Opphavs-grensesnitt:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Opphavs-grensesnitt:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Tvunnet Par (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuelt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "Tjene_ste:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "K_lonet MAC-adresse:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Passord for _privat nøkkel:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Forvalg"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Kringkasting"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Passord for _privat nøkkel:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Hastighet:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_ks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Koble til _VPN automatisk når du bruker denne tilkoblingen"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Alle br_ukere kan koble til dette nettverket"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Koble til dette nettverket _automatisk når det er tilgjengelig"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Koble til _VPN automatisk når du bruker denne tilkoblingen"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "Brannmur_sone:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Tilkoblings_informasjon"
+msgid "_Metered connection"
+msgstr "Sammenkoblede _tilkoblinger:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Overse automatisk i_nnhentede ruter"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "Brannmur_sone:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1785,7 +2020,7 @@ msgstr ""
 "IP-adresser identifiserer din datamaskin på nettverket. Klikk på «Legg til»-"
 "knappen for å legge til en IP-adresse."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1793,128 +2028,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatisk, kun adresser"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "_Transportmodus:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Transportmodus:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Enhetsnavn + tall"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Modus:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatisk med manuelle DNS-innstillinger"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Link-lokal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Delt med andre datamaskiner"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metode:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1925,8 +2164,8 @@ msgstr ""
 "konfigurasjonen av din datamaskin. Hvis du ønsker å bruke en identifikator "
 "for DHCP-klient kan du oppgi den her."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1934,25 +2173,26 @@ msgstr ""
 "Domener som brukes ved oppslag av vertsnavn. Bruk komma for å skille flere "
 "domener."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "Klient-ID for D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Søk_edomener:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS-tjenere"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1960,11 +2200,11 @@ msgstr ""
 "IP-adresse for navnetjenere som brukes for å slå opp vertsnavn. Bruk komma "
 "for å skille flere navnetjenere."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Krev IPv_4-adresser for at tilkoblingen skal fullføres"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1972,25 +2212,35 @@ msgstr ""
 "La tilkoblingen fullføres hvis IPv4-konfigurasjon feiler, men IPv6-"
 "konfigurasjon fungerer når du kobler til et nettverk som har støtte for IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Ruter …"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Slått på (foretrekk offentlig adresse)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Slått på (foretrekk midlertidig adresse)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Slå på"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2000,15 +2250,20 @@ msgstr ""
 "for å skille flere navnetjenere. Link-lokale adresser vil automatisk bli "
 "scopet til grensesnittet som kobles til."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "IPv6-utvidelser for _personvern:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Krev IPv_6-adressering for at denne tilkoblingen skal fullføres"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2016,756 +2271,861 @@ msgstr ""
 "Lar tilkobling fullføre hvis IPv6-konfigurasjon feiler, men IPv4-"
 "konfigurasjon går bra ved tilkobling til nettverk som støtter IPv4."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrisk"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mmer:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "N_ettverks-ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Bytt …"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Tillat _roaming hvis hjemmenettverk ikke er tilgjengelig"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Vis passord"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Tillatte metoder:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfigurer _metoder …"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Br_uk punkt-til-punkt kryptering (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "K_rev 128-bit kryptering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Bruk _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Tillat _BSD-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Tillat _Deflate-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Bruk komprimering av TCP-_hoder"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Ekko"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Send _ekko-pakker for PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Metode:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Importer en  …"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metode:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avansert"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ethernet-nettverk"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioritet:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Privat nø_kkel:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Pause før tilkoblingen tas _opp:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Pause før tilkoblingen tas ne_d:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "_Opphavs-grensesnitt:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP-_mål:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP-_mål:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Importer en  …"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_JSON-konfigurasjon:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Gruppebåndbredde:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioritet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Sammenkoblede _tilkoblinger:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioritet:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Overføringsst_yrke:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Overføringsst_yrke:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Opphavs-grensesnitt:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Navn på VLAN-grensesnitt:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Klonet MAC-adresse:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN-ID:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Enhetsnavn + tall"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "«vlan» + tall"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Sikk_erhet:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Overføringsst_yrke:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Ka_nal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Bån_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Tillatte autentiseringsmetoder"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versjon 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2775,190 +3135,185 @@ msgstr ""
 "autentiseringsmetoder. Hvis tilkoblinger feiler kan du prøve å slå av støtte "
 "for noen metoder."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Koble sammen"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bro"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN-tillegg klarte ikke å importere VPN-tilkoblingen.\n"
-"\n"
-"Feil: ingen type for VPN-tjeneste."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Kan ikke importere VPN-tilkobling"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Filen «%s» kunne ikke leses eller inneholder ikke informasjon om noen "
-"gjenkjente VPN-tilkoblinger\n"
+"VPN-tillegg klarte ikke å importere VPN-tilkoblingen.\n"
 "\n"
-"Feil: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Ukjent feil"
+"Feil: ingen type for VPN-tjeneste."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Velg fil som skal importeres"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Importer en lagret VPN-tilkobling …"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Dialog for redigering av tilkobling kunne ikke startes pga en ukjent feil."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Kunne ikke lage en ny tilkobling"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Sletting av tilkobling feilet"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sikker på at du vil slette denne tilkoblingen %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-tilkoblinger"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkobling uten navn"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Tilkoblings_navn:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2966,54 +3321,51 @@ msgstr ""
 "Redigering av tilkobling fant ikke alle nødvendige ressurser (.ui-fil ble "
 "ikke funnet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Lagre alle endringer som er gjort på denne tilkoblingen."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiser for å lagre denne tilkoblingen for alle brukere på denne maskinen."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Kunne ikke lage tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ukjent feil under oppretting av dialog for redigering av tilkobling."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3022,198 +3374,244 @@ msgstr ""
 "Sett denne til «true» for å slå av advarsler om CA-sertifikater med EAP-"
 "autentisering."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Tilkoblings_navn:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Eksporter …"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "aldri"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "nå"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d år siden"
 msgstr[1] "%d år siden"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Klarte ikke å legge til tilkobling"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL-tilkobling %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL-tilkobling %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for å redigere valgt tilkobling."
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for å slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Ikke støttet type mobil bredbåndsforbindelse."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Vet ikke hvordan tilkoblinger av type «%s» lages"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Feil under redigering av tilkobling"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Klarte ikke å legge til tilkobling"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Ingen VPN-tillegg er installert."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Vet ikke hvordan tilkoblinger av type «%s» lages"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Fant ingen tilkobling med UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Nettverkstilkoblinger"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN-tilkoblinger"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X sikkerhet"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for 802.1X-sikkerhet."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Bruk 802.1_X-sikkerhet for denne tilkoblingen"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Sammenkoblet tilkobling %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Ethernet-nettverk"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi-nettverk"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Primær:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sammenkoblet tilkobling %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Kunne ikke laste brukergrensesnitt."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Sammenkoblet tilkobling %d"
@@ -3221,32 +3619,37 @@ msgstr "Sammenkoblet tilkobling %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port for sammenkobling"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Opphavs-grensesnitt:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkobling %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3256,44 +3659,43 @@ msgstr ""
 "Dette valget låser denne tilkoblingen til nettverksenheten spesifisert av "
 "den permanente MAC-adressen som oppgis her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorert"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "K_lonet MAC-adresse:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-tilkobling %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3303,11 +3705,11 @@ msgstr ""
 "vanlig sone. Hvis du velger den får du forvalgt sone som er satt i brannmur. "
 "Kan kun brukes hvis firewalld er aktiv."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Kunne ikke laste generelt brukergrensesnitt."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3318,158 +3720,162 @@ msgstr ""
 "Dette valget låser denne tilkoblingen til nettverksenheten spesifisert av "
 "den permanente MAC-adressen som oppgis her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-tilkobling %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ethernet-tilkobling %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Kun automatiske (VPN) adresser"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Kunn automatiske (PPPoE) adresser"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Kun automatiske (DHCP) adresser"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Kun lokal link"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Flere _DNS-tjenere:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Flere søk_edomener:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediger IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillinger"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Kunne ikke laste brukergrensesnitt for WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX-tilkobling %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Dupliserte slaver"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Slaver «%s» og «%s» brukes begge på enhet «%s»"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3478,25 +3884,25 @@ msgstr ""
 "Slavene «%s» og «%s» brukes på forskjellige virtuelle porter («%s» og «%s») "
 "på samme fysiske enhet."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for mobilt bredbånd."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ikke støttet type mobil bredbåndsforbindelse."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Velg type tilbyder for mobilt bredbånd"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3505,92 +3911,88 @@ msgstr ""
 "Velg tekonlogien din bredbåndstilbyder for mobil bruker. Spør tilbyderen "
 "hvis du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Min tilbyder bruker _GSM-basert teknologi (f.eks GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbyder bruker C_DMA-basert teknologi (f.eks 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Rediger PPP-autentiseringsmetoder for %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-innstillinger"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Feil: filen inneholder ikke en gyldig JSON-konfigurasjon"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL-tilkobling %d"
@@ -3598,12 +4000,12 @@ msgstr "DSL-tilkobling %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "Port for sammenkobling"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
@@ -3611,58 +4013,58 @@ msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-tilkobling %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Klarte ikke å laste brukergrensesnitt for VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Fant ikke tjeneste for VPN-tillegg «%s»."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Fant ikke tjeneste for VPN-tillegg «%s»."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Feil med tilkobling"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Klarte ikke å laste brukergrensesnitt for VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Fant ikke tjeneste for VPN-tillegg «%s»."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-tilkobling %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Velg type VPN-tilkobling"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3673,7 +4075,7 @@ msgstr ""
 "finner riktig type VPN-tilkobling i listen er det mulig at du ikke har "
 "korrekt VPN-tillegg installert."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3682,7 +4084,7 @@ msgstr ""
 "Dette valget låser denne tilkoblingen til Wi-Fi-aksesspunkt (AP) som "
 "spesifiseres av BSSID som oppgis her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3692,96 +4094,94 @@ msgstr ""
 "Dette valget låser denne tilkoblingen til nettverksenheten spesifisert av "
 "den permanente MAC-adressen som oppgis her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Enhver enhet"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi-tilkobling %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit nøkkel (Heksadesimal eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet; mangler Wi-Fi-"
 "innstilling."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi-sikkerhet"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vil du erstatte %s med VPN-tilkoblingen du lagrer?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3792,222 +4192,106 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Eksporter VPN-tilkobling …"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Lås _opp"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Lås opp denne enheten automatisk"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Tilkoblingsinformasjon"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktive nettverkstilkoblinger"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Privat nø_kkel:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Passord for _privat nøkkel:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Br_ukersertifikat:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Din mobile bredbåndstilkobling er konfigurert med følgende innstillinger:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Din enhet:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Din tilbyder:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Din plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"En tilkobling til din bredbåndsleverandør for mobil blir nå satt opp med "
-"innstillingene du valgte. Hvis tilkoblingen feiler eller hvis du ikke får "
-"tilgang til nettverksressurser må du dobbeltsjekke innstillingene. For å "
-"endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
-"«Nettverkstilkoblinger» fra menyen System->Brukervalg."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Bekreft innstillinger for mobilt bredbånd"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Landet mitt er ikke på listen"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Velg din plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Advarsel: Hvis du velger feil plan kan dette resultere i ekstra utgifter på "
-"din bredbåndskonto eller forhindre tilkobling.\n"
-"\n"
-"Spør tilbyder om APN for ditt abonnement hvis du er usikker."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Velg din betalingsplan"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Min plan er ikke på listen …"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Velg din tilbyder fra en _liste:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Tilbyder:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Velg din tilbyder"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Liste med land eller regioner:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land eller region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Landet mitt er ikke på listen"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Velg din tilbyders land eller region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Enhver enhet"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil bredbåndstilkobling"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4015,191 +4299,270 @@ msgstr ""
 "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du trenger følgende informasjon:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Navnet på din bredbåndstilbyder"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Navn på betalingsplan for bredbånd"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(i enkelte tilfeller) APN (navn på aksesspunkt) for din betalingsplan for "
 "bredbånd"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Lag en tilkobling for _denne mobile bredbåndsenheten:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Enhver enhet"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbåndstilkobling"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Ny mobil bredbåndstilkobling"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Velg din tilbyders land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Velg din tilbyder fra en _liste:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min tilbyder bruker GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min tilbyder bruker CDMA-teknologi (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Velg din tilbyder"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Velg din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Navn på aksesspunkt) for valgt plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Advarsel: Hvis du velger feil plan kan dette resultere i ekstra utgifter på "
+"din bredbåndskonto eller forhindre tilkobling.\n"
+"\n"
+"Spør tilbyder om APN for ditt abonnement hvis du er usikker."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Velg din betalingsplan"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Din mobile bredbåndstilkobling er konfigurert med følgende innstillinger:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Din enhet:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Din tilbyder:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"En tilkobling til din bredbåndsleverandør for mobil blir nå satt opp med "
+"innstillingene du valgte. Hvis tilkoblingen feiler eller hvis du ikke får "
+"tilgang til nettverksressurser må du dobbeltsjekke innstillingene. For å "
+"endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
+"«Nettverkstilkoblinger» fra menyen System->Brukervalg."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Bekreft innstillinger for mobilt bredbånd"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ingen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A-sertifikat:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjent"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Br_ukersertifikat:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Feil under redigering av tilkobling"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "Lås _opp"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Lagre passordet kun for denne br_ukeren"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Lagre passordet for _alle brukere"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Spør om dette passordet _hver gang"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Sekundært passord:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Vis pass_ord"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Sekundært passord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "Vis pass_ord"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundært passord:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Koble fra"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Lag"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4207,70 +4570,90 @@ msgstr ""
 "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
 "«%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for Wi-Fi-nettverk kreves"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering kreves av Wi-Fi-nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nytt Wi-Fi-nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Oppgi et navn på Wi-Fi-nettverket du ønsker å opprette."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult Wi-Fi-nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "Oppgi navnet til det skjulte Wi-Fi-nettverket du ønsker å koble deg til."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi-_sikkerhet:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Tilkobli_ng:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi-_kort:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Tilbyder:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Liste med land eller regioner:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kablet"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4280,17 +4663,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi-_sikkerhet:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nettverksnavn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Tilkobli_ng:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi-_kort:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4298,7 +4703,7 @@ msgstr ""
 "Dette programmet er en del av NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4306,412 +4711,481 @@ msgstr ""
 "Det er ikke ment brukt via kommandolinjen og kjører i stedet i "
 "skrivebordsmiljøet GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ikke slått på"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ikke registrert"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hjemmenettverk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Hjemmenettverk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "søker"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nektet"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "\"Roaming\" nettverk (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "\"Roaming\" nettverk"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s-tilkobling"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM eller PKCS#12 private nøkler (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA-sertifikat k_reves ikke"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Velg en PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentisert"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Begge"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anony_m identitet:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC-_fil:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Indre autentisering:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Velg et Certificate Authority-sertifikat …"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versjon 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A-sertifikat:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP-_versjon:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit passord"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Vis pass_ord"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA-sertifikat k_reves ikke"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA-sertifikat k_reves ikke"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS (TTLS)"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (forvalg)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Åpent system"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (forvalg)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "Nø_kkel:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Vis nøkkel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP-inde_ks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Type:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (forvalg)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorert"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Klarte ikke å oppdatere hemmelighet for tilkobling på grunn av en ukjent "
+#~ "feil."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritet:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Koble til dette nettverket _automatisk når det er tilgjengelig"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Tilkoblings_informasjon"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Kan ikke importere VPN-tilkobling"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Filen «%s» kunne ikke leses eller inneholder ikke informasjon om noen "
+#~ "gjenkjente VPN-tilkoblinger\n"
+#~ "\n"
+#~ "Feil: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Ukjent feil"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Velg et Certificate Authority-sertifikat …"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A-sertifikat:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager panelprogram"
@@ -4745,30 +5219,6 @@ msgstr "_Type:"
 #~ 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"
 
@@ -4975,12 +5425,6 @@ msgstr "_Type:"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "Egenskap «%s» / «%s» er ugyldig: %d"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Kunne ikke laste brukergrensesnitt for WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX-tilkobling %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5004,9 +5448,6 @@ msgstr "_Type:"
 #~ msgid "Error: %s"
 #~ msgstr "Feil: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Kunne ikke lage en DUN-tilkobling: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefonen er klar til bruk!"
 
diff --git a/po/ne.po b/po/ne.po
index a4490fae..b5999d8b 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ne\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2007-11-13 20:36+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -19,234 +20,254 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n !=1\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "सञ्जाल नाम:"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
-msgid "Network Connections"
-msgstr "सञ्जाल जडान छैन"
+msgid "Advanced Network Configuration"
+msgstr "भीपीएन कन्फिगरेसन त्रुटि"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "सञ्जालप्रबन्धक एप्लेट"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "सञ्जालप्रबन्धक एप्लेट"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "प्रमाणीकरण:"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "जडान गर्नुहोस्"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "सञ्जाल नाम:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "भीपीएन जडान असफलता"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "तार भएको सञ्जालमा जडान असफल भयो ।"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "मलाई फेरि नसम्झाउनुहोस्"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -254,7 +275,7 @@ msgid ""
 "interrupted."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -262,14 +283,14 @@ msgid ""
 "interrupted."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,14 +300,14 @@ msgstr ""
 "भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
 "फर्काउन सकेन ।"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +316,7 @@ msgstr ""
 "भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
 "फर्काउन सकेन ।"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -304,28 +325,28 @@ msgstr ""
 "भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
 "फर्काउन सकेन ।"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -333,20 +354,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "भीपीएन लगइन सन्देश"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "भीपीएन जडान असफलता"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -357,7 +378,7 @@ msgstr ""
 "भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
 "फर्काउन सकेन ।"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -366,599 +387,626 @@ msgid ""
 "%s"
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 #, fuzzy
 msgid "Disconnect"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 #, fuzzy
 msgid "No network devices available"
 msgstr "सञ्जाल यन्त्र फेला परेन"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "भीपीएन जडान"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "भीपीएन कन्फिगर गर्नुहोस्..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "भीपीएन जडान"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "सञ्जालप्रबन्धक संचालन भइरहेको छैन ।"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "सञ्जालीकरण अक्षम गरियो"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "सञ्जालीकरण सक्षम पार्नुहोस्"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "ताररहित सक्षम पार्नुहोस्"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "जडान जानकारी"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "भीपीएन जडान"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "बारेमा"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "तपाईँ हाल अहिले ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "सञ्जाल जडान विच्छेदन भयो ।"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "सञ्जालप्रबन्धक एप्लेट"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "जडान स्थापना भयो"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 #, fuzzy
 msgid "You are now connected to the mobile broadband network."
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ताररहित सञ्जाल '%s' का लागि %s यन्त्र तयार गरिँदैछ..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ताररहित सञ्जाल '%s' का लागि %s यन्त्र तयार गरिँदैछ..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 #, fuzzy
 msgid "DSL authentication"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "तार भएको सञ्जाल"
 msgstr[1] "तार भएको सञ्जाल"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "सञ्जालीकरण अक्षम गरियो"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "तपाईँ हाल अहिले ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "गतिशील WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "कुनै पनि होइन"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "आईपी ठेगाना"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "प्रशारण ठेगाना"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "सबनेट मास्क"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "प्राथमिक डीएनएस:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "गौण डीएनएस:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, fuzzy, c-format
 msgid "Ethernet (%s)"
 msgstr "तार भएको इथरनेट (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "इन्टरफेस"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "हार्डवेयर ठेगाना"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ड्राइभर"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "गति"
 
-#: ../src/applet-dialogs.c:600
+#: src/applet-dialogs.c:616
 #, fuzzy
-msgid "Security:"
+msgid "Security"
 msgstr "ताररहित सुरक्षा:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "पूर्वनिर्धारित राउट"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "पासवर्ड:"
+
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "प्रकार:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "प्रयोगकर्ता नाम:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "भीपीएन जडान"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Copyright © 2004-2006 Red Hat, Inc.\n"
 "Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "तपाईको सञ्जाल यन्त्रहरू र जडानहरू प्रबन्धको लागि सूचना क्षेत्र एप्लेट ।"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "सञ्जालप्रबन्धक एप्लेट"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "श्यामकृष्ण बल"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -966,33 +1014,33 @@ msgid ""
 msgstr ""
 "सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक संसाधानहरू फेला पार्न सकेन (ग्लेड फाइल फेला परेन) ।"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "पासवर्ड:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1000,25 +1048,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1026,89 +1074,96 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "जडान जानकारी"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "सक्रिय जडान छैन!"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1116,652 +1171,799 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "प्रशारण ठेगाना:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "PAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "इन्टरफेस:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "प्राथमिक डीएनएस:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
-msgstr ""
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
+msgstr "प्राथमिक डीएनएस:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "सञ्जालीकरण सक्षम पार्नुहोस्"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr ""
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "हार्डवेयर ठेगाना:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "जडान त्रुटिका कारण भीपीएन जडान '%s' सुरु गर्न सकेन ।"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
-msgid "_Username:"
+msgid "_Username"
 msgstr "प्रयोगकर्ता नाम:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 #, fuzzy
 msgid "Sho_w password"
 msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
-msgid "_Password:"
+msgid "_Password"
 msgstr "पासवर्ड:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "इन्टरफेस"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "इन्टरफेस:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "इन्टरफेस:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 #, fuzzy
 msgid "Automatic"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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 ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
+msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "पूर्वनिर्धारित राउट:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "प्रशारण ठेगाना:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
+msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
-msgid "_Speed:"
+msgid "_Speed"
 msgstr "गति:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "कुनै पनि होइन"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "जडान जानकारी"
+msgid "_Metered connection"
+msgstr "सक्रिय जडान छैन!"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1769,1137 +1971,1243 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "जडान गर्नुहोस्"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "इन्टरफेस:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
-msgid "_Method:"
+msgid "_Method"
 msgstr "ईएपी विधि:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+#, fuzzy
+msgid "EAP"
+msgstr "PEAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "सञ्जाल नाम:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 #, fuzzy
 msgid "Sho_w passwords"
 msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
-msgstr ""
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
+msgstr "प्रमाणीकरण:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ईएपी विधि:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "कुनै पनि होइन"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ईएपी विधि:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
+msgstr "निजी कुञ्जी फाइल:"
+
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "निजी कुञ्जी फाइल:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "भीपीएन कन्फिगरेसन त्रुटि"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "भीपीएन कन्फिगरेसन त्रुटि"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "TKIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "हार्डवेयर ठेगाना:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "हार्डवेयर ठेगाना:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "इन्टरफेस:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "इन्टरफेस:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
+msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "ताररहित सुरक्षा:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 #, fuzzy
 msgid "_MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 #, fuzzy
 msgid "MSCHAP v_2"
 msgstr "MSCHAPV2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-#, fuzzy
-msgid "Cannot import VPN connection"
-msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
-
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "हार्डवेयर ठेगाना:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 #, fuzzy
 msgid "Connection delete failed"
 msgstr "जडान स्थापना भयो"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "भीपीएन जडान"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 #, fuzzy
 msgid "Address"
 msgstr "आईपी ठेगाना:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "जडान स्थापना भयो"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -2907,255 +3215,298 @@ msgid ""
 msgstr ""
 "सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक संसाधानहरू फेला पार्न सकेन (ग्लेड फाइल फेला परेन) ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 #, fuzzy
 msgid "Connection add failed"
 msgstr "जडान स्थापना भयो"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
-msgid "Connection _name:"
+msgid "Connection _name"
 msgstr "जडान जानकारी"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "जडान स्थापना भयो"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "सञ्जाल जडान छैन"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "सञ्जाल जडान छैन"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "सक्रिय जडान छैन!"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "जडान स्थापना भयो"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+#, fuzzy
+msgid "Network Connections"
+msgstr "सञ्जाल जडान छैन"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "भीपीएन जडान"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "सञ्जालमा लगइन गर्नुहोस्"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "प्राथमिक डीएनएस:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "तारसहित सञ्जाल जडान"
@@ -3163,86 +3514,90 @@ msgstr "तारसहित सञ्जाल जडान"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "इन्टरफेस:"
+
+#: src/connection-editor/page-dsl.c:365
 #, fuzzy, c-format
 msgid "DSL connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 #, fuzzy
 msgid "Wake-on-LAN password"
 msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "तारसहित सञ्जाल जडान"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 #, fuzzy
 msgid "Default"
 msgstr "पूर्वनिर्धारित राउट:"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3250,276 +3605,272 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 #, fuzzy
 msgid "Automatic (VPN)"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 #, fuzzy
 msgid "Automatic (PPPoE)"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 #, fuzzy
 msgid "Automatic (DHCP)"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 #, fuzzy
 msgid "Automatic, DHCP only"
 msgstr "स्वचालित (पूर्वानिर्धारण)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-#, fuzzy
-msgid "EAP"
-msgstr "PEAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 #, fuzzy
 msgid "CHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPV2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
@@ -3527,182 +3878,180 @@ msgstr "'%s' लाई भीपीएन जडान"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "भीपीएन जडान असफलता"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "भीपीएन जडान"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "'%s' लाई भीपीएन जडान"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 #, fuzzy
 msgid "Dynamic WEP (802.1X)"
 msgstr "गतिशील WEP"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 #, fuzzy
 msgid "WPA & WPA2 Personal"
 msgstr "WPA2 व्यक्तिगत"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 #, fuzzy
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 उद्यमशिलता"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "ताररहित सुरक्षा:"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3710,430 +4059,392 @@ msgid ""
 "Error: %s."
 msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "भीपीएन जडान"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "जडान जानकारी"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "तारसहित सञ्जाल जडान"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "निजी कुञ्जी फाइल:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "निजी कुञ्जी पासवर्ड:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "कुनै पनि होइन"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "गौण डीएनएस:"
+msgid "Sh_ow passwords"
+msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "निजी कुञ्जी पासवर्ड:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "पासवर्ड देखाउनुहोस्"
+msgid "_Secondary Password:"
+msgstr "गौण डीएनएस:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+msgid "_Password:"
+msgstr "पासवर्ड:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "कुनै पनि होइन"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "गतिशील WEP"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ताररहित सञ्जाल कुञ्जी चाहियो"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4141,38 +4452,54 @@ msgid ""
 msgstr ""
 "तपाईँले सिर्जना गर्न चाहनुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "ताररहित सुरक्षा:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "जडान गर्नुहोस्"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "ताररहित एडप्टर:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4182,445 +4509,483 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ताररहित सुरक्षा:"
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "सञ्जाल नाम:"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "जडान गर्नुहोस्"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ताररहित एडप्टर:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "सञ्जालमा लगइन गर्नुहोस्"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "भीपीएन जडान"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr ""
+#: src/wireless-security/eap-method.c:370
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "बेनामी पहिचान:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
-msgid "Anony_mous identity:"
+msgid "Anony_mous identity"
 msgstr "बेनामी पहिचान:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-#, fuzzy
-msgid "C_A certificate:"
-msgstr "सीए प्रमाणपत्र फाइल:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit पासफ्रेज"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "पासफ्रेज देखाउनुहोस्"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "सीए प्रमाणपत्र फाइल:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "सीए प्रमाणपत्र फाइल:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-#, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "पहिचान:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPV2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "प्रमाणीकरण:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "खुल्ला प्रणाली"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "साझेदार गरिएको कुञ्जी"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
+
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
-msgid "_Key:"
+msgid "_Key"
 msgstr "कुञ्जी:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 #, fuzzy
 msgid "Sho_w key"
 msgstr "कुञ्जी देखाउनुहोस्"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
-msgid "_Type:"
+msgid "_Type"
 msgstr "प्रकार:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
+
+#, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "जडान त्रुटिका कारण भीपीएन जडान '%s' सुरु गर्न सकेन ।"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "जडान जानकारी"
+
+#, fuzzy
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
+
+#, fuzzy
+#~ msgid "Active Network Connections"
+#~ msgstr "तारसहित सञ्जाल जडान"
+
+#, fuzzy
+#~ msgid "C_A certificate:"
+#~ msgstr "सीए प्रमाणपत्र फाइल:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "सञ्जालप्रबन्धक एप्लेट"
 
@@ -4667,9 +5032,6 @@ msgstr "प्रकार:"
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "ताररहित इथरनेट (%s)"
 
-#~ msgid "translator-credits"
-#~ msgstr "श्यामकृष्ण बल"
-
 #~ msgid ""
 #~ "Copyright © 2004-2005 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
@@ -4829,9 +5191,6 @@ msgstr "प्रकार:"
 #~ msgid "Select the Private Key File"
 #~ msgstr "निजी कुञ्जी फाइल चयन गर्नुहोस्"
 
-#~ msgid "Show passphrase"
-#~ msgstr "पासफ्रेज देखाउनुहोस्"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "सधै यो ताररहित सञ्जाललाई विश्वास गर्नुहोस्"
 
diff --git a/po/nl.po b/po/nl.po
index f8b218cc..304b81f0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-02-27 18:32+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-03-04 16:37+0100\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
@@ -27,7 +27,8 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-05-18 08:04+0000\n"
 "X-Project-Style: gnome\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Netwerk"
 
@@ -219,7 +220,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "802.1X-authenticatie"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -469,125 +470,125 @@ msgid "No network devices available"
 msgstr "Er zijn geen netwerkapparaten beschikbaar"
 
 # Netwerken
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-verbindingen"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPN _configureren…"
 
 # Netwerken
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "Een _VPN-verbinding toevoegen…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Netwerkbeheer draait niet…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Netwerken is uitgeschakeld"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Netwerk inschakelen"
 
 # Wireless gebruiken
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Wifi inschakelen"
 
 # gebruiken/aanzetten/inschakelen
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiel breedband inschakelen"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Meldingen inschakelen"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Verbindings_informatie"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Verbindingen bewerken…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "I_nfo"
 
 # met het netwerk %s/via het netwerk
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "U bent nu verbonden met ‘%s’."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "De verbinding met het netwerk is verbroken."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Netwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor netwerkverbinding ‘%s’…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Er wordt een netwerkadres aangevraagd voor ‘%s’…"
 
 # is actief/actief
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Netwerkverbinding ‘%s’ is actief"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Bezig met starten van VPN-verbinding ‘%s’…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Gebruikersauthenticatie vereist voor VPN-verbinding ‘%s’…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "VPN-adres aanvragen voor ‘%s’…"
 
 # actief/ingesteld/in werking
 # met/via
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-verbinding is actief"
 
 # geen netwerk/netwerkverbinding
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Netwerkbeheer-applet"
 
@@ -604,7 +605,7 @@ msgstr "Verkeerde pincode; neem contact op met uw telefoonmaatschappij."
 msgid "Sending unlock code…"
 msgstr "Ontgrendelingscode wordt verzonden…"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiel breedband (%s)"
@@ -735,7 +736,7 @@ msgstr "Verbinding via kabelnetwerk ‘%s’ actief"
 msgid "DSL authentication"
 msgstr "DSL-authenticatie"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -851,183 +852,192 @@ msgstr "Verbinding via wifi-netwerk ‘%s’ actief"
 msgid "Failed to activate connection"
 msgstr "Activeren van verbinding mislukt"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisch WEP"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Meer adressen"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
 # zonder/geen
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 # niet bekend/onbekend
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast-adres"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnetmasker"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "Primaire DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "Secundaire DNS"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "Tertiaire DNS"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11-wifi (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Algemeen"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardware-adres"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Stuurprogramma"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Snelheid"
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: src/applet-dialogs.c:584
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Beveiliging"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Standaardroute"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Wachtwoord:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-type"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-gateway"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-gebruikersnaam"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-banier"
 
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Basisverbinding"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Geen geldige actieve verbindingen gevonden!"
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1037,25 +1047,25 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "en vele bijdragen van vertalers en anderen uit de gemeenschap"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Een toepassing in het mededelingengebied voor het beheren van uw "
 "netwerkapparaten en -verbindingen."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Website Netwerkbeheer"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Nathan Follens <nthn@unseen.is>\n"
 "\n"
 "Meer info over Gnome-NL http://nl.gnome.org/"
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1063,36 +1073,36 @@ msgstr ""
 "Het Netwerkbeheerapplet kon bepaalde vereiste bronnen niet vinden (het .ui-"
 "bestand is niet gevonden)."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Ontbrekende bronnen"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Wachtwoord voor het mobiele breedbandnetwerk"
 
 # om een verbinding te maken met/voor het verbinden met
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Er is een wachtwoord nodig om een verbinding te maken met ‘%s’."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Wachtwoord:"
 
 # nodig/gevraagd/vereist
 # geen letterlijke vertaling van unlock
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM-pincode vereist"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM-pincode vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1102,26 +1112,26 @@ msgstr ""
 "het gebruikt kan worden."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Pincode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Pincode tonen"
 
 # gevraagd/vereist
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM-pukcode vereist"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM-pukcode vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1131,35 +1141,35 @@ msgstr ""
 "gebruikt kan worden."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Pukcode:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nieuwe pincode:"
 
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Voer nieuwe pincode nogmaals in:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Puk-/pincodes weergeven"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Verbinding heeft geen VPN-instelling"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Kon verbinding niet naar VPN-gebruikersinterface schrijven: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Kon verbinding niet naar VPN-gebruikersinterface schrijven: onvolledig "
@@ -3106,10 +3116,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Client"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Hotspot"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
@@ -3983,12 +3989,12 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mijn provider gebruikt C_DMA-technologie (bijv. 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4270,6 +4276,10 @@ msgstr "Verbindingsinformatie"
 msgid "_Close"
 msgstr "_Sluiten"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4314,32 +4324,28 @@ msgid "My country is not listed"
 msgstr "Mijn land komt niet in de lijst voor"
 
 # komt niet in de lijst voor/onbekend/niet in de lijst
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Niet in de lijst"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Mijn abonnement komt niet in de lijst voor…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provider"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land of regio"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM-apparaat geïnstalleerd"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA-apparaat geïnstalleerd"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Elk apparaat"
 
@@ -4374,23 +4380,24 @@ msgstr ""
 "(in sommige gevallen) De naam van het APN (Access Point Name) voor uw "
 "abonnement"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Een verbinding _aanmaken voor dit mobiele breedbandapparaat:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Een mobiele breedbandverbinding instellen"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lijst voor land of regio:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land of regio"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Kies het land of de regio van uw provider"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Selecteer uw provider uit de _lijst:"
 
@@ -4675,6 +4682,14 @@ msgstr "Ik kan mijn provider niet vinden en wil het hand_matig invoeren:"
 msgid "Provider:"
 msgstr "Provider:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lijst voor land of regio:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land of regio"
+
 # kabeldraad/bekabeld/bedraad/draad
 # dit is de titel van het tabblad:
 # wired/wireless/VPN/GSM
diff --git a/po/nn.po b/po/nn.po
index c6f355ac..c2787110 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,8 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-05-08 10:24+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-no@lister.ping.uio.no>\n"
@@ -21,79 +22,89 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Handsam nettverkstilkoplingane"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Nettverkstilkoplingar"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktive nettverkstilkoplingar"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Handter og endra innstillingar for nettverkstilkopling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Slå av varsel om tilkopling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Set til TRUE for å slå av varsel når du koplar til eit nettverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Slå av varsel om fråkopling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Set til TRUE for å slå av varsel når du koplar frå eit nettverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Slå av varsel om tilkopling"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "Set til TRUE for å slå av varsel når du koplar frå eit nettverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Hindra varsel om tilgjengelege nettverk"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Set til TRUE for å slå av varsel når trådlause nettverk er tilgjengelege."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stempel"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Brukt til å fastslå om innstillingar skal verta migrert til ein ny versjon."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Slå av laging av trådlaust nettverk"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -101,156 +112,169 @@ msgstr ""
 "Set til TRUE for å slå av laging av ad hoc-nettverk ved bruk av "
 "miniprogrammet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Vel CA-sertifikat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Panelprogram for NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Inga nettverkstilkopling"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Panelprogram for NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Kabla 802.1X-autentisering"
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nettverksnamn:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Klarte ikkje laga/ta i bruk tilkopling"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Feil under tilkopling"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Klarte ikkje kopla frå eining"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Feil under fråkopling"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Klarte ikkje ta i bruk tilkopling"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Ikkje vis denne meldinga igjen"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart fråkopla fordi nettverkstilkoplinga vart broten."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -270,7 +294,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka fordi nettverkstilkoplinga vart avbroten."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta vart uventa stoppa."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta sendte eit ugyldig "
 "oppsett."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka på grunn av eit tidsavbrot."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -309,7 +333,7 @@ msgstr ""
 "VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje vart starta i "
 "tide."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -318,7 +342,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje klarte å starta."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -328,7 +352,7 @@ msgstr ""
 "VPN-tilkoplinga «%s» vart mislukka fordi det ikkje fanst nokon gyldige "
 "gyldige VPN-løyndomar."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -337,7 +361,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka pga. ugyldige VPN-løyndomar."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -346,7 +370,7 @@ msgstr ""
 "\n"
 "VPN-tilkoplinga «%s» vart mislukka."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -357,19 +381,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-tilkopling vart kopla opp.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-tilkoplinga vart mislukka"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -382,7 +406,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -395,574 +419,599 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "eininga er ikkje klar (manglar fastvare)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "eininga er ikkje klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "fråkopla"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Kopla frå"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "eining ikkje handsama"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Ingen nettverkseiningar er tilgjengelege"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoplingar"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Set opp VPN …"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN-tilkoplingar"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager køyrer ikkje …"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Slå på _nettverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Slå på _trådlaus"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Slå på _mobilt breiband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Slå på _varsling"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Tilkoplings_informasjon"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Rediger tilkoplingar …"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Du er no kopla til «%s»."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Fråkopla"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Nettverkstilkoplinga er fråkopla."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Førebur nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Brukarautentisering krevst for nettverkstilkoplinga «%s» …"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Ber om ei nettverksadresse for «%s» …"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Nettverkstilkoplinga «%s» er i bruk"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Startar VPN-tilkopling «%s» …"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Brukarautentisering krevst for VPN-tilkoplinga «%s» …"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Ber om ei VPN-adresse for «%s» …"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN-tilkopling «%s» i bruk"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Inga nettverkstilkopling"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Panelprogram for NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Feil PUK-kode. Kontakt leverandøren."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Feil PIN-kode. Kontakt leverandøren."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Sender opplåsingskode …"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt breiband (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilt breiband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tilgjengeleg"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Ny mobil breibandstilkopling"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Tilkoplinga er sett opp"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er no kopla til eit mobilt breibandnettverk."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Passord for mobilt breibandsnettverk"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Du er no registrert på heimenettverket."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Du er no registrert som gjest på eit utanlandsk nettverk."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du er no kopla til eit mobilt breibandnettverk."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Førebur mobil breibandstilkopling «%s» …"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Set opp mobil breibandstilkopling «%s» …"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Brukarautentikasjon er påkravt for den mobile breibandstilkoplinga %s …"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobil breibandstilkopling «%s» er i bruk."
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatisk lokalnett"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Kabla nettverk"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Kabla nettverk"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Du er no kopla til eit kabla nettverk."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Førebur kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Set opp kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Brukarautentisering krevst av den kabla nettverkstilkoplinga «%s» …"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Ber om ei nettverksadresse for det kabla nettverket «%s» …"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Kabla nettverkstilkopling «%s» er  i bruk"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentisering"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Kopla til eit gøymt trådlaust nettverk"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Opprett nytt trådlaust nettverk"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Klarte ikkje leggja til ny tilkopling"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Kabla nettverk"
 msgstr[1] "Kabla nettverk"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX er slått av"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX er slått av med brytar"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Fleire nettverk"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Trådlause nettverk er tilgjengelege"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Bruk nettverksmenyen for å kopla til eit trådlaust nettverk"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Du er no kopla til trådlaust nettverk «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Førebur nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Set opp kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Brukarautentisering krevst av det trådlause nettverket «%s» …"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Ber om ei nettverksadresse for «%s» …"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Trådlaus nettverkstilkopling «%s» er i bruk: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Kabla nettverkstilkopling «%s» er  i bruk"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Klarte ikkje å ta i bruk tilkoplinga"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Feil under vising av tilkoplingsinformasjon:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Adresser"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (forvald)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjend"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Kringkastingsadresse"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnettmaske"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Primær DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Sekundær DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Ternær DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Snøggleik"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Tryggleik:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Standard rute"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorert"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-type"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-portnar"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-brukarnamn"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-topptekst"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Grunntilkopling"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukjend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Fann ingen tilkoplingar som er i bruk."
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -970,17 +1019,21 @@ msgstr ""
 "Opphavsrett © 2005–2008 Novell, Inc.\n"
 "og mange andre bidragsytarar og omsetjarar i fellesskapet"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Panelprogram for handtering av dine nettverkseiningar og -tilkoplingar."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Netstaden til NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -988,33 +1041,33 @@ msgstr ""
 "NetworkManager-miniprogrammet fann ikkje alle nødvendige ressursar (fann "
 "ikkje .ui-fila)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Manglande ressursar"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Passord for mobilt breibandsnettverk"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Passord krevst for å kopla til «%s»."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Opplåsingskode for SIM-kortet er nødvendig"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Opplåsingskode for SIM-kortet er nødvendig"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1024,25 +1077,25 @@ msgstr ""
 "kan brukast."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Opplåsing av PUK-koden til SIM-kortet er nødvendig"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Opplåsing av PUK-koden til SIM-kortet er nødvendig"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1052,35 +1105,42 @@ msgstr ""
 "kan brukast."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Skriv inn ny PUK-kode på nytt:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-kodar"
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Tilkoplingsinformasjon"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Klarte ikkje oppretta PAN-tilkopling: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1089,41 +1149,41 @@ msgstr ""
 "IP-adresser identifiserer datamaskina di på nettverket. Trykk på «Legg til»-"
 "knappen for å leggja til ei IP-adresse."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Slett"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "O_versjå automatisk innhenta ruter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Br_uk denne tilkoplinga berre for ressursar på nettverket ho tilhøyrer"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1131,17 +1191,17 @@ msgstr ""
 "Viss det er kryssa av her vil denne tilkoplinga aldri verta brukt som den "
 "forvalde nettverkstilkoplinga."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Lag …"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Vel type VPN-tilkopling"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1152,213 +1212,273 @@ msgstr ""
 "Vel type VPN du ønskjer å bruka for den nye tilkoplinga. Dersom du ikkje "
 "finn rett type i lista, har du kanskje ikkje riktig VPN-tillegg installert."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "Tene_ste:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Kringkastingsadresse:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Grunntilkopling:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_odus:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Grensesnitt:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Primær DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytar"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Grunntilkopling:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Slå på _nettverk"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "forval"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1369,437 +1489,530 @@ msgstr ""
 "nettverkseininga denne tilkoplinga brukar. Denne funksjonen er kjend som MAC-"
 "kloning. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Eikvar eining"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Klarte ikkje å oppdatera tilkoplingsløyndom pga. ein ukjend feil."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Bruk 802.1_X-tryggleik for denne tilkoplinga"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Brukarnamn:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "Tene_ste:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "V_is passord"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Passord:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Grensesnitt"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Grensesnitt:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Grensesnitt:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Tvinna Par (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "Tene_ste:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Klona MAC-adresse:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Passord for privat nøkkel:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Kringkastingsadresse:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Passord for privat nøkkel:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Snøggleik:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Full duple_ks"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ingen"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Du er no kopla til eit kabla nettverk."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Lås opp denne eininga automatisk"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Tilkoplings_informasjon"
+msgid "_Metered connection"
+msgstr "Grunntilkopling:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Kopla til _automatisk"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1808,7 +2021,7 @@ msgstr ""
 "IP-adresser identifiserer datamaskina di på nettverket. Trykk på «Legg til»-"
 "knappen for å leggja til ei IP-adresse."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1816,128 +2029,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatisk, berre adresser"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "fråkopla"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Tene_ste:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatisk med manuelle DNS-innstillingar"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Tilkopling-lokal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Delt med andre datamaskiner"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metode:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1947,8 +2163,8 @@ msgstr ""
 "DHCP-klientidentifikatoren tillèt nettverksadministratoren til å tilpassa "
 "innstillingane til datamaskina di. Skriv inn identifikatoren her "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1956,25 +2172,26 @@ msgstr ""
 "Eitt eller fleire domene som vert brukt til å slå opp vertsnamn. Bruk komma "
 "for å skilja domener frå kvarandre."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP-klient-ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Søkjedomene:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS-tenarar:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1982,11 +2199,11 @@ msgstr ""
 "IP-adresser til domenenamntenarar vert brukt til å slå opp versnamn. Bruk "
 "komma for å skilja fleire adresser til domenenamntenarar."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Krev IPv4-adressering for å fullføra denne tilkoplinga"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1994,25 +2211,34 @@ msgstr ""
 "Tillèt bruk av IPv6 ved tilkopling til nettverk med støtte for IPv6, dersom "
 "IPv4-oppsett ikkje fungerer."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Ruter …"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2022,15 +2248,19 @@ msgstr ""
 "IP-adresser til domenenamntenarar vert brukt til å slå opp versnamn. Bruk "
 "komma for å skilja fleire adresser til domenenamntenarar."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Krev IPv6-adressering for å fullføra denne tilkoplinga"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2038,750 +2268,854 @@ msgstr ""
 "Tillèt bruk av IPv4 ved tilkopling til nettverk med støtte for IPv4, dersom "
 "IPv6-oppsett ikkje fungerer."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Kostnad"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Importer"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Grunnleggjande"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_mmer:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Nettverks-ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Endra …"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Tillat _vandring dersom heimenettverk ikkje er tilgjengeleg"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Vis passord"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Tillatne metodar:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Set opp _metodar …"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Bruk punkt-til-punkt-kryptering (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Krev 128-bitars kryptering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Bruk til_standsrik MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Tillat _BSD-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Tillat _Deflate-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Bruk komprimering på TCP-hovud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Ekko"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Send PPP-ekkopakkar"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Metode:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metode:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avansert"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Kabla nettverk"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "Tryggl_eik:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Privat nø_kkel:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Grensesnitt:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Grunntilkopling:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "Automatisk lokalnett"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_Sendareffekt:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_Sendareffekt:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Grensesnitt:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Grensesnitt:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Klona MAC-adresse:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Sendareffekt:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Ka_nal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Tillatne autentiseringsmetodar"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versjon 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2791,112 +3125,100 @@ msgstr ""
 "autentiseringsmetodar. Dersom du ikkje får kopla til, prøv å slå av støtte "
 "for nokre metodar."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN-tilleggsprogrammet klarte ikkje å importera VPN-tilkoplinga rett.\n"
-"\n"
-"Feil: Ingen VPN-tenestetype."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Klarte ikkje importera VPN-tilkopling"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Fila «%s» kunne ikkje lesast eller inneheld ikkje gjenkjend VPN- "
-"tilkoplingssinformasjon\n"
+"VPN-tilleggsprogrammet klarte ikkje å importera VPN-tilkoplinga rett.\n"
 "\n"
-"Feil: %s"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Ukjend feil"
+"Feil: Ingen VPN-tenestetype."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Vel fil som skal importerast"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Maskinvareadresse:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Eksporter VPN-tilkopling …"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2904,79 +3226,86 @@ msgstr ""
 "Klarte ikkje starta dialogvindauge for tilkoplingsredigering på grunn av ein "
 "ukjend feil."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Klarte ikkje laga ny tilkopling"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Sletting av tilkopling feila"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Er du sikker på at du vil sletta tilkoplinga %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN-tilkoplingar"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Portnar"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Kostnad"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkopling utan namn"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Tilkoplings_namn:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Feil når redigeringsverktøyet skulle startast"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Klarte ikkje leggja til tilkopling"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2984,257 +3313,300 @@ msgstr ""
 "Tilkoplingsredigering fann ikkje alle nødvendige ressursar (fann ikkje .ui-"
 "fila)"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Lagra"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Lagra alle endringar for denne tilkoplinga."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentiser til å lagra denne innstillinga til alle brukarane av denne "
 "maskina."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Klarte ikkje laga ny tilkopling"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Klarte ikkje redigera tilkopling"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Klarte ikkje laga vindauge for tilkoplingsredigering."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Feil når redigeringsverktøyet skulle startast"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Klarte ikkje leggja til tilkopling"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Tilkoplings_namn:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "E_ksporter"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "aldri"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "no"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt sidan"
 msgstr[1] "%d minutt sida"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time sidan"
 msgstr[1] "%d timar sidan"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sidan"
 msgstr[1] "%d dagar sidan"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d månad sidan"
 msgstr[1] "%d månader sidan"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d år sidan"
 msgstr[1] "%d år sidan"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Klarte ikkje leggja til tilkopling"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Kabla tilkopling %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Kabla tilkopling %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Rediger valt tilkopling"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for å redigera den valde tilkoplinga"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Slett vald tilkopling"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser til å sletta den valde tilkoplinga"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Ustøtta mobil breibandtilkoplingstype."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Veit ikkje korleis «%s»-tilkoplingar vert laga"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Feil under redigering av tilkopling"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Klarte ikkje oppretta tilkopling"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Klarte ikkje leggja til tilkopling"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Veit ikkje korleis «%s»-tilkoplingar vert laga"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkopling"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Fann ikkje tilkopling med UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Nettverkstilkoplingar"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN-tilkoplingar"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-tryggleik"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaus tryggleik."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Bruk 802.1_X-tryggleik for denne tilkoplinga"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "klarte ikkje å finna blåtanneininga."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Slå på _nettverk"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Trådlaust nettverk"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Primær DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Kabla tilkopling %d"
@@ -3242,34 +3614,39 @@ msgstr "Kabla tilkopling %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for DSL-nettverk."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for DSL-nettverk."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Grensesnitt:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkopling %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3279,57 +3656,56 @@ msgstr ""
 "Dette alternativet låser tilkoplinga til nettverkseininga med den permanente "
 "MAC-adressa oppgjeve her. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorert"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Klona MAC-adresse:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Kabla tilkopling %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3340,186 +3716,188 @@ msgstr ""
 "Dette alternativet låser tilkoplinga til nettverkseininga med den permanente "
 "MAC-adressa oppgjeve her. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaust nettverk."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv4-nettverk."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Berre automatiske (VPN-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatisk, berre adresser"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Berre automatiske (PPPoE-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Berre automatiske (DHCP-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Berre lokal lekkje"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_DNS-tenarar:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_Søkjedomene:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redigerer IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillingar"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv4-nettverk."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, berre DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerer IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillingar"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv6-nettverk"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Klarte ikkje lasta brukargrensesnitt for DSL-nettverk."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL-tilkopling %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for mobilt breibandnettverk."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ustøtta mobil breibandtilkoplingstype."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Vel mobil breibandtilbydartype"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3528,90 +3906,86 @@ msgstr ""
 "Vel teknologien tilbydaren til ditt mobile breiband brukar. Spør tilbydaren "
 "om du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Min tilbydar brukar _GSM-basert teknologi (GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min tilbydar brukar C_DMA-basert teknologi (1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Endrar PPP-autentiseringsmetodar for %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP-innstillingar"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for PPP-nettverk"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Kabla tilkopling %d"
@@ -3619,11 +3993,11 @@ msgstr "Kabla tilkopling %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
@@ -3631,59 +4005,59 @@ msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Inga nettverkstilkopling"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv4-nettverk."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN-tilkopling %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Klarte ikkje lasta brukargrensesnitt for VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Klarte ikkje finna VPN-programtilleggsteneste til «%s»."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Klarte ikkje finna VPN-programtilleggsteneste til «%s»."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Feil under tilkopling"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Klarte ikkje lasta brukargrensesnitt for VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Klarte ikkje finna VPN-programtilleggsteneste til «%s»."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-tilkopling %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Vel type VPN-tilkopling"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3693,7 +4067,7 @@ msgstr ""
 "Vel type VPN du ønskjer å bruka for den nye tilkoplinga. Dersom du ikkje "
 "finn rett type i lista, har du kanskje ikkje riktig VPN-tillegg installert."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3702,7 +4076,7 @@ msgstr ""
 "Dette alternativet låser denne tilkoplinga til eit trådlaust aksesspunkt "
 "(AP), bestemt av BSSID-en oppgjeve her. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3712,100 +4086,98 @@ msgstr ""
 "Dette alternativet låser tilkoplinga til nettverkseininga med den permanente "
 "MAC-adressa oppgjeve her. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaust nettverk."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Eikvar eining"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøkkel (Heksadesimal eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passfrase"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personleg"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Klart ikkje lasta brukargrensesnitt for trådlaus tryggleik; manglar "
 "trådlausinnstilling."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Trådlaus tryggleik"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaus tryggleik."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Ei fil kalla «%s» finst alt."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Byt ut"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vil du byta ut %s med VPN-tilkoplinga du no lagrar?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Klarte ikkje eksportera VPN-tilkopling"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3816,222 +4188,106 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Eksporter VPN-tilkopling …"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Lås opp"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Lås opp denne eininga automatisk"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Tilkoplingsinformasjon"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktive nettverkstilkoplingar"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "C_A-sertifikat:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Vel ditt personlege sertifikat …"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Privat nø_kkel:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Passord for privat nøkkel:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Vel ditt personlege sertifikat …"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Br_ukarsertifikat:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Den mobile breibandstilkoplinga er set opp med følgjande innstillingar:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Di eining:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Din tilbydar:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Din plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Vil no kopla til ditt mobile breiband med dei innstillingane du vel. "
-"Dobbelsjekk innstillingane dine om tilkoplinga feilar eller du ikkje får "
-"tilgang til nettverksressursar. Vel «Nettverkstilkoplingar» frå «System → "
-"Nettverkstilkoplingar» for å endra innstillingane til den mobile "
-"breibandstilkoplinga di."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Stadfest innstillingar for mobilt breiband"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mitt land er ikkje oppgjeve"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikkje lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Vel planen din:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Vald plan-_APN (namn til tilgangspunkt):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Åtvaring: Å velja feil betalingsplan kan føra til at du vert trekt for feile "
-"beløp eller at du ikkje får kopla deg til.\n"
-"\n"
-"Kontakt tilbydaren din om du er usikker på kva for plan du har."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Vel betalingsplanen din"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Min plan er ikkje oppgjeven …"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Vel tilbydaren din frå ei _liste:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tilbydar"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Tilbydar:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Min tilbydar brukar GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Min tilbydar brukar CDMA-teknologi (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Vel tilbydaren din"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Liste over land eller regionar:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land eller region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mitt land er ikkje oppgjeve"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Vel landet eller regionen for leverandøren din"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Innstallert GSM-eining"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-eining"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Eikvar eining"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Ny mobil breibandstilkopling"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4039,191 +4295,270 @@ msgstr ""
 "Denne vegvisaren hjelper deg å setja opp ei mobil breibandstilkopling til "
 "eit 3G-nettverk."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du treng følgjande informasjon:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Namnet på breibandtilbydaren din"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Namnet på betalingsplanen til breibandet ditt"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(i nokre tilfelle) APN-en (namnet på tilgangspunkt) til breibandet ditt sin "
 "betalingsplan"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Lag ei tilkopling for _denne mobile breibandseininga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Eikvar eining"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set opp ei mobil breibandstilkopling"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Ny mobil breibandstilkopling"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Vel landet eller regionen for leverandøren din"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Vel tilbydaren din frå ei _liste:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Min tilbydar brukar GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Min tilbydar brukar CDMA-teknologi (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Vel tilbydaren din"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Vel planen din:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Vald plan-_APN (namn til tilgangspunkt):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Åtvaring: Å velja feil betalingsplan kan føra til at du vert trekt for feile "
+"beløp eller at du ikkje får kopla deg til.\n"
+"\n"
+"Kontakt tilbydaren din om du er usikker på kva for plan du har."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Vel betalingsplanen din"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Den mobile breibandstilkoplinga er set opp med følgjande innstillingar:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Di eining:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Din tilbydar:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Din plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Vil no kopla til ditt mobile breiband med dei innstillingane du vel. "
+"Dobbelsjekk innstillingane dine om tilkoplinga feilar eller du ikkje får "
+"tilgang til nettverksressursar. Vel «Nettverkstilkoplingar» frå «System → "
+"Nettverkstilkoplingar» for å endra innstillingane til den mobile "
+"breibandstilkoplinga di."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Stadfest innstillingar for mobilt breiband"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ingen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A-sertifikat:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Vel ditt personlege sertifikat …"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Br_ukarsertifikat:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Feil under redigering av tilkopling"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Lås opp"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "S_pør etter dette passordet kvar gong"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Passord krevst for å kopla til «%s»."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Passord:"
+msgid "Sh_ow passwords"
+msgstr "_Vis passord"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Passord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "_Vis passord"
+msgid "_Secondary Password:"
+msgstr "_Passord:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Kopla frå"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "L_ag"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4231,42 +4566,42 @@ msgstr ""
 "Passord eller krypteringsnøklar er nødvendig for å kopla til det trådlause "
 "nettverket «%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for trådlaust nettverk påkravd"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering er påkravd av det trådlause nettverket"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Opprett nytt trådlaust nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Nytt trådlaust nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Oppgje eit namn på det trådlause nettverket du ønskjer å oppretta."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kopla til eit gøymt trådlaust nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Gøymt trådlaust nettverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4275,37 +4610,55 @@ msgstr ""
 "Oppgje namnet og tryggleiksdetaljane til det gøymde trådlause nettverket du "
 "ynskjer å kopla til."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "Tr_ådlaus tryggleik:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Tilkopli_ng:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Trådlaust _kort:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Tilbydar:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Liste over land eller regionar:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kabla"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4315,17 +4668,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Tr_ådlaus tryggleik:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nettverksnamn:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Tilkopli_ng:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Trådlaust _kort:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4333,7 +4710,7 @@ msgstr ""
 "Dette programmet er ein komponent av NetworkManager https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4341,415 +4718,464 @@ msgstr ""
 "Det er ikkje meint for å brukast gjennom kommandolinja, men heller å køyrast "
 "i GNOME-skrivebordsmiljøet."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ikkje slått på"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ikkje registrert"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimenettverk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Heimenettverk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "søkjer"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nekta"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s utanlands)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (utanlands)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Utanlandsk nettverk (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Utanlandsk nettverk"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kode påkravd"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode er påkravd av den mobile breibandseininga"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobil breibandstilkopling «%s» er i bruk: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "utanlands"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Grunntilkopling:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER- eller PEM-sertifikat (*.der, *.pem, *.crt, *cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM eller PKCS#12 private nøklar (*.der, *.pem, *p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Vel PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentisert"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Begge"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anony_m identitet:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC-_fil:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "I_ndre autentisering:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-_tildeling"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Vel eit sertifikatautorisert sertifikat (CA) …"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versjon 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A-sertifikat:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP-_versjon:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit passfrase"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Vis passord"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "C_A-sertifikat:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentitet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Verna EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Au_tentisering:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Forval)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Ope system"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Forval)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "Nø_kkel:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Vis nøkkel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP-indek_s:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Type:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (forvald)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorert"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Klarte ikkje å oppdatera tilkoplingsløyndom pga. ein ukjend feil."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Tilkoplings_informasjon"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Klarte ikkje importera VPN-tilkopling"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Fila «%s» kunne ikkje lesast eller inneheld ikkje gjenkjend VPN- "
+#~ "tilkoplingssinformasjon\n"
+#~ "\n"
+#~ "Feil: %s"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Vel eit sertifikatautorisert sertifikat (CA) …"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A-sertifikat:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Panelprogram for NetworkManager"
@@ -4786,15 +5212,6 @@ msgstr "_Type:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "F_orhandla automatisk"
 
@@ -4899,12 +5316,6 @@ msgstr "_Type:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Sekundær DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Ternær DNS:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Slå på WiMA_X mobilt breiband"
 
@@ -4951,12 +5362,6 @@ msgstr "_Type:"
 #~ msgid "_Save..."
 #~ msgstr "_Lagra …"
 
-#~ msgid "_Import"
-#~ msgstr "_Importer"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Kopla til _automatisk"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "_Tilgjengeleg til alle brukarar"
 
@@ -4989,9 +5394,6 @@ msgstr "_Type:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Veit ikkje korleis «%s»-tilkoplingar vert endra"
 
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Klarte ikkje oppretta PAN-tilkopling: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefonen din er no klar til bruk!"
 
diff --git a/po/oc.po b/po/oc.po
index f2340656..726a2ec4 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2016-03-10 21:49+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
 "Language-Team: Tot En Òc\n"
@@ -21,49 +22,58 @@ msgstr ""
 "X-Launchpad-Export-Date: 2015-05-20 17:00+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Ret"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Gerissètz vòstras connexions a la ret"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Connexions ret"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Connexions de ret activas"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gerir e modificar los paramètres de las connexions de ret"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desactivar las notificacions de connexion"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
 "moment de la connexion a una ret."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desactivar las notificacions de desconnexion"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
 "moment de la desconnexion a una ret."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Desactivar las notificacions VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -71,53 +81,54 @@ msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
 "moment de la connexion o de la desconnexion a un VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Desactivar las notificacions de disponibilitat de rets sens fial"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar las notificacions al "
 "moment de la disponibilitat de rets Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Tampon"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Servís a determinar se los paramètres devon èsser migrats dins una version "
 "novèla."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desactivar la creacion Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar la creacion d'una "
 "ret adhoc al moment de l'utilizacion de l'applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Afichar l'applet dins la zòna de notificacion"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Definir a FALS (FALSE) per desactivar l'afichatge de l'applet dins la zòna "
 "de notificacion."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorar lo certificat de CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -125,7 +136,7 @@ msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
 "prepaus dels certificats CA dins l'autentificacion EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -133,128 +144,141 @@ msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
 "prepaus dels certificats CA dins la fasa 2 de l'autentificacion EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Pas cap de connexion de ret"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Apondon (applet) NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autentificacion 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onnectat"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nom de la ret :"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "securizat."
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Fracàs de l'apondon/creacion de la connexion"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Error desconeguda"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Fracàs de la connexion"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "La desconnexion del periferic a fracassat"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Fracàs de la desconnexion"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "L'activacion de la connexion a fracassat"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Visualizar pas pus aqueste messatge"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "La connexion VPN « %s » es estada desconnectada perque la connexion ret es "
 "estada interrompuda."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -276,7 +300,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque la connexion ret es estada "
 "interrompuda."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -286,7 +310,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo servici VPN es estat arrestat "
 "d'un biais imprevist."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +321,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo service VPN a renviat una "
 "configuracion invalida."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo relambi de connexion es "
 "depassat."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo servici VPN s'es pas aviat a "
 "temps."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -327,7 +351,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque l'aviada del servici VPN a "
 "fracassat."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -336,7 +360,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat perque i aviá pas de secrets VPN valids."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -345,7 +369,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat en rason de secrets VPN invalids."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -354,7 +378,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -365,19 +389,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "La connexion VPN es estada establida amb succès.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Messatge de connexion VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "La connexion VPN a pas capitat"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,7 +415,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -404,565 +428,591 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "periferic pas prèst (micrologicial mancant)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "periferic pas prèst"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desconnectar"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "periferic pas gerit"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Cap de periferic de ret pas disponible"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager fonciona pas..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Ret desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activar la _ret"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Activar la ret _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la connexion _mobila de benda larga"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activar las _notificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Entresenhas sus la connexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Modificar las connexions..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_A prepaus"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Ara, sètz connectat a « %s »."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "La connexion ret es estada desconnectada."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparacion de la connexion a la ret « %s »..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Autentificacion necessària per la connexion a la ret « %s »..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Obtencion d'una adreça de ret per « %s »..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Connexion ret « %s » activa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Aviada de la connexion VPN « %s »..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Autentificacion necessària per la connexion VPN « %s »..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Obtencion d'una adreça VPN per « %s »..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Connexion VPN « %s » activa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Pas cap de connexion de ret"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Apondon (applet) NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Còde PUK erronèu ; contactatz vòstre provesidor."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Còde PIN erronèu ; contactatz vòstre provesidor."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Mandadís del còde de desverrolhatge..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Connexion mobila de benda larga (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Connexion mobila de benda larga"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Connexion novèla mobila de benda larga"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Connectat"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ara sètz connectat a la ret mobila."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Ret mobila."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Ara sètz enregistrat sus la ret domestica."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Ara sètz enregistrat sus una ret itineranta."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Ara sètz connectat a la ret mobila de benda larga"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Preparacion de la connexion telefòn mobil de benda larga « %s »..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Configuracion de la connexion telefòn mobil de banda larga « %s »..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Autentificacion personala necessària per la connexion telefòn mobil de benda "
 "larga « %s »..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Connexion telefòn mobil de benda larga « %s » active"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatic"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Rets Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ret Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Rets Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ret Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ara sètz connectat a la ret Ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Preparacion de la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Configuracion de la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Autentificacion necessària per la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Obtencion d'una adreça de ret Ethernet per « %s »..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Connexion a la ret Ethernet « %s » activa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autentificacion DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Connexion a la ret Wi-Fi invisibla"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Creacion d'una novèla ret Wi-Fi"
 
 #
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(pas cap)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "L'apondon de la novèla connexion a fracassat"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Rets Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Ret Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Ret Wi-Fi"
 msgstr[1] "Rets Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "lo Wi-Fi es desactivat"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "lo Wi-Fi es desactivat per un comutador material"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Mai de rets"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Rets Wi-Fi disponiblas"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilizatz lo menú ret per vos connectar a una ret Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Ara sètz connectat a la ret Wi-Fi « %s »."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Preparacion de la connexion ret Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Configuracion de la connexion a la ret Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Autentificacion necessària per la ret Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Obtencion d'una adreça ret Wi-Fi per « %s »..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Connexion a la ret Wi-Fi « %s » activa : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Connexion a la ret Wi-Fi « %s » activa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "L'activacion de la connexion a fracassat"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Error al moment de l'afichatge de las informacions de connexion :"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
 #
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP dinamic"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Mai d'adreças"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (per defaut)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mo/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adreça IP "
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adreça de broadcast "
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Amagatal de sosret "
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS primaire :"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS segondària :"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS terciari :"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "Wifi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfaç "
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adreça materiala "
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Pilòt "
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocitat "
 
 #
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Seguretat :"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Rota per defaut "
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorat"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Mot de pas :"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipe de VPN "
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Palanca pel VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nom d'utilizaire pel VPN "
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Bandièra pel VPN "
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Connexion de basa "
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Cap de connexion valida activa pas trobada !"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -970,18 +1020,22 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e fòrça contributors e traductors mai de la comunautat"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Applet de zòna de notificacion per la gestion dels periferics de ret e de "
 "las connexions."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager fonciona pas..."
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -989,33 +1043,33 @@ msgstr ""
 "L'applet NetworkManager a pas pogut trobar las ressorsas requeridas (lo "
 "fichièr .ui es pas estat trobat)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Ressorsas mancantas"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Senhal de la ret telefòn mobil de benda larga"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Un senhal es requerit per vos connectar a « %s »."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Mot de pas :"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Desverrolhatge SIM PIN requesit"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Desverrolhatge SIM PIN requesit"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1025,25 +1079,25 @@ msgstr ""
 "èsser utilizat."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Còde PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Afichar lo còde PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Desverrolhatge SIM PUK requesit"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Desverrolhatge SIM PUK requesit"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1053,35 +1107,42 @@ msgstr ""
 "èsser utilizat."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Còde PUK :"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Còde PIN novèl :"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Repicatz lo novèl còde PIN :"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Afichar los còdes 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Entresenhas sus la connexion"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Fracàs de creacion de la connexion DUN : %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1090,41 +1151,41 @@ msgstr ""
 "Las adreças IP identifican vòstre ordenador sus la ret. Clicatz sul boton « "
 "Apondre » per apondre una adreça IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Suprimir"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norar automaticament las rotas obtengudas"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Utilizar aquesta connexion unicament per las ressorsas de sa ret"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1132,16 +1193,16 @@ msgstr ""
 "Se activat, aquesta connexion serà pas jamai utilizada coma connexion ret "
 "per defaut."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Crear…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Seleccionar un tipe de connexion"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1153,85 +1214,100 @@ msgstr ""
 "Se creatz un VPN e qu'apareis pas dins la lista, es possible qu'ajatz pas lo "
 "bon plugin VPN d'installat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Periferic :"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Circulara"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Salvament actiu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Equilibratge adaptatiu de carga de transmission"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Equilibratge adaptatiu de carga"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomandat)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Connexions ligadas :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "Mòde"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Modificar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Frequéncia de contraròtle :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Nom de l'interfàcia :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Contraròtle del _ligam :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "Cibl_as ARP :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1239,19 +1315,22 @@ msgstr ""
 "Una adreça IP, o una lista d'adreças IP separadas per de virgulas, de "
 "recercar al moment de la verificacion de l'estatut del ligam."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Relambi de c_onnexion :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Relambi de _desconnexion :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Principal :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1259,104 +1338,162 @@ msgstr ""
 "Le nom d'interfàcia del periferic principal. Si défini, ce periferic sera "
 "toujours l'esclau actif lorsqu'il est disponible."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MT_U :"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "octets"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Còst de la ligason :"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritat :"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Mòde en espin_gòla :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Pon_t entre connexions :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Rel_ambi d'acaminament :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Relambi _hello :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Activar la _ret I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activar _STP (protocòl Spanning Tree)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Durada maximum :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Durada de vida :"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatic"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "per defaut"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "error pas especificada"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Activar"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1368,195 +1505,234 @@ msgstr ""
 "foncionalitat es coneguda jol nom de clonatge o usurpacion MAC. Exemple : "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Adreça MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Adreça HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s invalid (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Nom de l'interfàcia VLAN :"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Adreça materiala :"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, fuzzy, c-format
 msgid "invalid %s (%s): "
 msgstr "%s invalid (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "periferic"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, fuzzy, c-format
 msgid "invalid %s (%s) "
 msgstr "%s invalid (%s)"
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"La mesa a jorn de las informacions d'autentificacion de connexion a "
-"fracassat en rason d'una error desconeguda"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Utilizar Data Center Bridging (DCB) per aquesta connexion"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Contraròtle del flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Foncion"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Publicar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Consentent"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Opcions..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Gropes de prioritats"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Contraròtle del flux de las prioritats"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Activa o desactiva la transmission d'una pausa de prioritat per cada "
 "prioritat utilizaire."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioritat :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7 :"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Classa del trafic :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Benda passanta estricta :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Benda passanta prioritària :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Benda passanta del grop :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Identificant del grop :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Picatz l'identificant del grop de prioritats per cada prioritat utilizaire."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1565,243 +1741,305 @@ msgstr ""
 "prioritats pòt utilizar per la ligason. La soma alogada a totes los gropes "
 "deu far 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Picatz lo percentatge de benda passanta del grop de prioritats que cada "
 "prioritat utilizaire pòt utilizar."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Activatz o desactivatz la benda passanta estricta de cada prioritat "
 "utilizaire."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Picatz la classa de trafic per cada prioritat utilizaire."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nom d'_utilizaire :"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Servici :"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "A_fichar lo senhal"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "Sen_hal :"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfaç "
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfàcia _parenta :"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfàcia _parenta :"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Para torsadada (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interfàcia (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface(MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Pòrt :"
 
-#: ../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 "_Periferic :"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "Adreça _MAC clonada :"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Per de_faut"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
+msgstr "A_fichar los senhals"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocitat :"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Bidireccional _simultanèu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 ""
-"Se connectar automaticament al _VPN quand aquesta connexion es utilizada"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Òc"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Non"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Totes los _utilizaires se pòdon connectar a aquesta ret"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Se connectar _automaticament a aquesta ret se disponibla"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr ""
+"Se connectar automaticament al _VPN quand aquesta connexion es utilizada"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Entresenhas sus la connexion"
+msgid "Firewall _zone"
+msgstr "_Zòna del parafuòc :"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Connexions en equipa :"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Ig_norar automaticament las rotas obtengudas"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Zòna del parafuòc :"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1810,7 +2048,7 @@ msgstr ""
 "Las adreças IP identifican vòstre ordenador sus la ret. Clicatz sul boton « "
 "Apondre » per apondre una adreça IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1818,128 +2056,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automatic, adreças solament"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adreças"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Mòde de _transpòrt :"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagrama"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Mòde de _transpòrt :"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Numèro + del nom del periferic"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Periferic Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Mòde :"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U :"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatic amb parametratge manual del DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Ligam-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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Partejat amb d'autres ordenadors"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metòde :"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1950,8 +2192,8 @@ msgstr ""
 "personalizar la configuracion de vòstre ordenador. Se volètz utilizar un "
 "identificant de client DHCP, apondètz-lo aicí."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1959,25 +2201,26 @@ msgstr ""
 "Domenis utilizats al moment de la resolucion dels noms d'òstes. Utilizatz de "
 "virgulas per separar mantun domeni."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID de client D_HCP :"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Do_menis de recèrca :"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Ser_vidors DNS :"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1985,11 +2228,11 @@ msgstr ""
 "Adreças IP dels servidors DNS utilizadas per la resolucion dels noms "
 "d'òstes. Utilizatz de virgulas per separar mantuna adreça DNS."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Requerís un adreçatge IPv_4 per qu'aquesta connexion foncione"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1998,25 +2241,35 @@ msgstr ""
 "connexion de foncionar quand la configuracion IPv6 es capitada, quitament se "
 "la configuracion IPv4 fracassa."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rotas…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Activat (adreça publica preferida)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Activat (adreça temporària preferida)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Activar"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2026,15 +2279,20 @@ msgstr ""
 "d'òstes. Utilizatz de virgulas per separar mantuna adreça DNS. Las adreças "
 "de ligam local seràn automaticament ligadas a l'interfàcia de connexion."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Extensions de confidencialitat IPv6 :"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requerís un adreçatge IPv_6 per qu'aquesta connexion foncione"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2043,754 +2301,863 @@ msgstr ""
 "connexion de foncionar quand la configuracion IPv4 es capitada, quitament se "
 "la configuracion IPv4 fracassa."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrica"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "N_ombre :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "A_vançat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Identificant de r_et :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Modificar..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Autorizar l'itine_rança se la ret domestica es indisponibla"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "A_fichar los senhals"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentificacion"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Metòdes autorizats :"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurar los _metòdes…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compression"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Utilizar lo chiframent Point-to-Point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Necessita un chiframent 128 bits"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Utilizar lo MPPE amb e_stat"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permetre la compression de donadas _BSD"
 
 # Deflate is a lossless data compression algorithm
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permetre la compression de donadas « _Deflate »"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Utilizar la compression de las _entèstas TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Resson"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Mandar los pa_quets de resson PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Metòde :"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Importar una configuracion en equipa a partir d'un fichier..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metòde :"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "A_vançat"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Rets Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioritat :"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioritat :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioritat :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_Clau privada :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Relambi de c_onnexion :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Relambi de _desconnexion :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Interfàcia _parenta :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "Cibl_as ARP :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "Cibl_as ARP :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Importar una configuracion en equipa a partir d'un fichier..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Configuracion _JSON :"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Benda passanta del grop :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioritat"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Periferic Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Connexions en equipa :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Adreça materiala :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Adreça materiala :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioritat :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "P_oténcia de transmission :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "P_oténcia de transmission :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Interfàcia _parenta :"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "_Nom de l'interfàcia VLAN :"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "Adreça MA_C clonada :"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "Ident_ificant VLAN :"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Marcadors :"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Numèro + del nom del periferic"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + numèro"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Seg_uretat :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Client"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "P_oténcia de transmission :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mo/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "Taus"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "SSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Canal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ben_da :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID :"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Metòdes d'autentificacion autorizadas"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2800,110 +3167,99 @@ msgstr ""
 "prenon en carga totes los metòdes d'autentificacion. Se la connexion "
 "fracassa, ensajatz de ne desactivar d'unas."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Ligam"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "En equipa"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"L'empeuton VPN a pas capitat d'importar corrèctament la connexion VPN\n"
-"\n"
-"Error : pas cap tipe de servici VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Impossible d'importar una connexion VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Lo fichièr « %s » pòt pas èsser legit o conten pas d'informacions de "
-"connexion VPN reconegudas\n"
+"L'empeuton VPN a pas capitat d'importar corrèctament la connexion VPN\n"
 "\n"
-"Error : %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
-msgstr "Error desconeguda"
+"Error : pas cap tipe de servici VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Seleccionatz lo fichièr d'importar"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Material"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Importar una configuracion VPN enregistrada..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2911,77 +3267,84 @@ msgstr ""
 "La fenèstra d'edicion de connexion a pas pogut èsser inicializada en rason "
 "d'una error desconeguda."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Impossible de crear una connexion novèla"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "La supression de la connexion a fracassat"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sètz segur que volètz suprimir la connexion %s ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Connexions _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Masqueta de ret"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Palanca"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Modificacion de %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Modificacion de la connexion anonima"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Nom de la connexion mancant"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Inicializacion de l'editor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "La connexion pòt pas èsser modificada"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2989,57 +3352,54 @@ msgstr ""
 "L'editor de connexion a pas pogut trobar las ressorsas requeridas (lo "
 "fichièr .ui es pas estat trobat)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "Enregi_strar"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Enregistrar tota modificacion aportada a aquesta connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "S'autentificar per enregistrar aquesta connexion per totes los utilizaires "
 "d'aqueste ordenador."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Impossible de crear una connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Impossible de modificar la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Error desconeguda al moment de la creacion de la fenèstra d'edicion de "
 "connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Error al moment de l'inicializacion de l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "L'apondon de la connexion a fracassat"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3048,196 +3408,242 @@ msgstr ""
 "Definir aqueste paramètre a verai (true) per desactivar los avertiments a "
 "prepaus dels certificats CA dins l'autentificacion EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Entresenhas sus la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Exportar..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "jamai"
 
 #
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ara"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuta i a"
 msgstr[1] "%d minutas i a"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora i a"
 msgstr[1] "%d oras i a"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d jorn i a"
 msgstr[1] "%d jorns i a"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mes i a"
 msgstr[1] "%d meses i a"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d an i a"
 msgstr[1] "%d ans i a"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "La connexion pòt pas èsser modificada"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Connexion en equipa %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Connexion en equipa %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Darrièra utilizacion"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Modifica la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "S'autentificar per modificar la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Suprimís la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "S'autentificar per suprimir la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Tipe de connexion mobila de benda larga pas pres en carga."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Lo metòde per crear de connexions « %s » es desconegut"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Error al moment de la modificacion de la connexion"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Error al moment de la creacion de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "La connexion pòt pas èsser modificada"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Cap d'empeuton VPN es pas installat."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Lo metòde per crear de connexions « %s » es desconegut"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Error al moment de la modificacion de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "La connexion amb l'UUID « %s » es pas estada trobada"
 
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Connexions ret"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Connexions _VPN"
+
 #
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Seguretat 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire de seguretat 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Utilizar la seguretat 802.1_X per aquesta connexion"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Connexion Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Tipe de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Ret Ethernet _personala"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del ligam."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "principal"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del pont."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion pont %d"
@@ -3245,74 +3651,78 @@ msgstr "Connexion pont %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Pòrt del pont"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del pòrt de pont."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfàcia _parenta :"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DLS %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorat"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Periferic Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "Adreça _MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexion Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Per defaut"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3323,11 +3733,11 @@ msgstr ""
 "parametrada dins lo parafuòc. Aquò es pas utilizable que se FirewallD es "
 "activat."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire principala."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3335,158 +3745,162 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexion InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Connexion Ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Adreças automaticas solament (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatic, adreças solament"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Adreças automaticas solament (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Adreças automaticas solament (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Ligam-local solament"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Ser_vidors DNS suplementaris :"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Do_menis de recèrca suplementaris :"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modificacion de las rotas IPv4 per %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Paramètres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP solament"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modificacion de las rotas IPv6 per %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Paramètres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Impossible de cargar l'interfàcia de l' utilizaire IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Impossible de cargar l'interfàcia d'utilizaire WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Connexion WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Esclaus duplicats"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Los esclaus « %s » e « %s » s'aplican totes dos al periferic « %s »"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3495,26 +3909,26 @@ msgstr ""
 "Los esclaus « %s » e « %s » s'aplican a de pòrts virtuals diferents (« %s » "
 "e « %s ») del meteis periferic fisic."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "Esclau %s %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Impossible de cargar l'interfàcia de l'utilizaire de la connexion mobila."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tipe de connexion mobila de benda larga pas pres en carga."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccion del tipe de provesidor de connexion mobila de benda larga"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3523,7 +3937,7 @@ msgstr ""
 "Seleccionatz la tecnologia utilizada per vòstre provesidor de connexion "
 "mobila de benda larga. En cas de dobte, interrogatz vòstre provesidor."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mon provesidor utiliza una tecnologia de tipe _GSM (GPRS, EDGE, UMTS, HSDPA, "
@@ -3531,85 +3945,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Mon provesidor utiliza una tecnologia de tipe C_DMA (1xRTT, EVOD, etc.)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "pas cap"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Modificacion dels metòdes d'autentificacion PPP per %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Paramètres PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del ligam."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Error : lo fichier ne contient pas de configuracion JSON valide"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire en equipa."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion en equipa %d"
@@ -3617,69 +4027,69 @@ msgstr "Connexion en equipa %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Pòrt d'equipa"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del port d'equipa."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via « %s »)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Connexion novèla..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire VLAN."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexion VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Impossible de cargar l'interfàcia d'utilizaire VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Impossible de trobar lo servici d'empeuton VPN per « %s »."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Impossible de trobar lo servici d'empeuton VPN per « %s »."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Fracàs de la connexion"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Impossible de cargar l'interfàcia d'utilizaire VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Impossible de trobar lo servici d'empeuton VPN per « %s »."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexions VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccionar un tipe de connexion VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3690,7 +4100,7 @@ msgstr ""
 "connexion. Se lo tipe de connexion VPN apareis pas dins la lista, es "
 "possible qu'ajatz pas lo bon empeuton VPN installat."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3699,102 +4109,100 @@ msgstr ""
 "Aquesta opcion verrolha aquesta connexion sul punt d'accès (PA) Wi-Fi "
 "especificat pel BSSID picat aicí. Per exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Periferic Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Clau WEP 40/128-bit (Hex o ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasa secreta WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamic (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 entrepresa"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Impossible de cargar l'interfàcia d'utilizaire de seguretat Wi-Fi ; "
 "paramètre Wi-Fi mancant."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Seguretat Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire de seguretat Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "I a ja un fichièr que se sòna « %s »"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Remplaçar"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Volètz remplaçar %s per la connexion VPN que sètz a enregistrar ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Impossible d'exportar la connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3805,224 +4213,106 @@ msgstr ""
 "\n"
 "Error : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Exportar la connexion VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Desverrolhar"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Desverrolhar automaticament aqueste periferic"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Entresenhas sus la connexion"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Connexions de ret activas"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Causissètz lo certificat de CA :"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Clau privada :"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Senhal de la clau privada :"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Causissètz lo certificat de CA :"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Certificat de l'_utilizaire :"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"Vòstra connexion mobila de benda larga es configurada amb los paramètres "
-"seguents :"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Vòstre periferic :"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Vòstre provesidor :"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Vòstre plan :"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Ara, una connexion va èsser efectuada cap a vòstre provesidor de connexion "
-"mobila de benda larga amb los paramètres qu'avètz indicats. Se la connexion "
-"fracassa o qu'avètz pas accès a las ressorsas de la ret, verificatz una còp "
-"de mai los paramètres. Per los modificar, causissètz « Connexions ret » dins "
-"lo menú Sistèma > Preferéncias."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirmacion dels paramètres de connexion mobila de benda larga"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mon país es pas dins la lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Pas dins la lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Causissètz vòstre plan :"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Nom del punt d'accès (_APN) causit :"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Avertiment : la causida d'un marrit plan pòt aver de consequéncias sus la "
-"facturacion de vòstre compte benda larga o pòt empachar la connexion.\n"
-"\n"
-"S'avètz de dobtes sul bon plan, interrogatz vòstre provesidor a prepaus del "
-"nom del punt d'accès (APN)."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Causissètz vòstre plan de facturacion"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Mon plan figura pas dins la lista..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Seleccionatz vòstre provesidor dins la _lista :"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provesidor"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Provesidor :"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Mon provesidor utiliza la tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Mon provesidor utiliza la tecnologia CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Causissètz vòstre provesidor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista dels païses o de las regions :"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País o region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mon país es pas dins la lista"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Causissètz lo país o la region de vòstre provesidor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Periferic GSM installat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Periferic CDMA installat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Un aparelh quin que siá"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Connexion novèla mobila de benda larga"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4030,186 +4320,267 @@ msgstr ""
 "Aqueste assistent vos ajuda a configurar aisidament una connexion mobila de "
 "benda larga a una ret cellulara (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vos cal dispausar de las informacions seguentas :"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Lo nom de vòstre provesidor benda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Lo nom de vòstre plan de facturacion benda largac"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "Lo nom del punt d'accès (APN) de vòstre plan de facturacion benda larga "
 "(dins d'unes cases)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Crear una connexion per aqueste aparelh _mobil de benda larga :"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Un aparelh quin que siá"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configuracion d'una connexion mobila de benda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Connexion novèla mobila de benda larga"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País o region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Causissètz lo país o la region de vòstre provesidor"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Seleccionatz vòstre provesidor dins la _lista :"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Mon provesidor utiliza la tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Mon provesidor utiliza la tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Causissètz vòstre provesidor"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Causissètz vòstre plan :"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Nom del punt d'accès (_APN) causit :"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Avertiment : la causida d'un marrit plan pòt aver de consequéncias sus la "
+"facturacion de vòstre compte benda larga o pòt empachar la connexion.\n"
+"\n"
+"S'avètz de dobtes sul bon plan, interrogatz vòstre provesidor a prepaus del "
+"nom del punt d'accès (APN)."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Causissètz vòstre plan de facturacion"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Vòstra connexion mobila de benda larga es configurada amb los paramètres "
+"seguents :"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Vòstre periferic :"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Vòstre provesidor :"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Vòstre plan :"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Ara, una connexion va èsser efectuada cap a vòstre provesidor de connexion "
+"mobila de benda larga amb los paramètres qu'avètz indicats. Se la connexion "
+"fracassa o qu'avètz pas accès a las ressorsas de la ret, verificatz una còp "
+"de mai los paramètres. Per los modificar, causissètz « Connexions ret » dins "
+"lo menú Sistèma > Preferéncias."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmacion dels paramètres de connexion mobila de benda larga"
 
 #
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(pas cap)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificat del C_A :"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Desconegut"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Causissètz lo certificat de CA :"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Certificat de l'_utilizaire :"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Error al moment de la modificacion de la connexion"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Desverrolhar"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Enregistrar lo senhal seulement per aqueste _utilizaire"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Enregistrar lo senhal per _totes los utilizaires"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "De_mandar aqueste senhal a cada còp"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Un senhal es requesit per vos connectar a « %s »."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "Senhal _segondari :"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "A_fichar los senhals"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "Senhal _terciari :"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "A_fichar los senhals"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Senhal _segondari :"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "Sen_hal :"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Clicar per se connectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP dinamic (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4217,35 +4588,35 @@ msgstr ""
 "De senhals o de claus de chiframent son necessaris per l'accès a la ret Wi-"
 "Fi « %s »."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentificacion necessària per la ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificacion demandada per la ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Creacion d'una novèla ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Novèla ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Picatz lo nom de la ret Wi-Fi que volètz crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion a la ret Wi-Fi invisibla"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Ret Wi-Fi amagada"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4253,35 +4624,55 @@ msgstr ""
 "Picatz lo nom e los detalhs de seguretat de la ret Wi-Fi invisibla a la "
 "quala vos volètz connectar."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Seguretat Wi-Fi :"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nnexion :"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Ad_aptador Wi-Fi :"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Provesidor :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista dels païses o de las regions :"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País o region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Filara"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malhum OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4291,17 +4682,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Seguretat Wi-Fi :"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nom de la ret :"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nnexion :"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Ad_aptador Wi-Fi :"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Usatge :"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4309,7 +4722,7 @@ msgstr ""
 "Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4317,412 +4730,480 @@ msgstr ""
 "Es pas concebut per interagir amb la linha de comanda, mas s'intègra puslèu "
 "dins l'environament de burèu GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "pas activat"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "pas enregistrat"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ret domestica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Ret domestica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "recèrca"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "enregistrament refusat"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (itinerança %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (itinerança)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ret itineranta (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Ret itineranta"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Còde PIN per carta SIM « %s » sus « %s »"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Còde PIN requerit"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Lo còde PIN es necessari pel telefòn mobil de benda larga"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Connexion mobila de benda larga « %s » activa : (%d %%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "itinerança"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Connexion %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claus privadas DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Causir un fichièr PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Fichièr PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Totes los fichièrs"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentificat"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Los dos"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identitat anoni_ma :"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Fichièr _PAC :"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Autentificacion i_ntèrna :"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermetre lo provisionament PAC automatic"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Causissètz un certificat d'una autoritat de certificacion..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificat del C_A :"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Version de _PEAP :"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Frasa secreta WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "A_fichar los senhals"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Aucun certificat de CA n'est _requis"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Aucun certificat de CA n'est _requis"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_dentitat :"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Au_tentificacion :"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (per defaut)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistèma dobèrt"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Clau partejada"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (per defaut)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Clau :"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "A_fichar la clau"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Indè_x WEP :"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipe :"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (per defaut)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorat"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "La mesa a jorn de las informacions d'autentificacion de connexion a "
+#~ "fracassat en rason d'una error desconeguda"
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritat :"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Se connectar _automaticament a aquesta ret se disponibla"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Entresenhas sus la connexion"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Impossible d'importar una connexion VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Lo fichièr « %s » pòt pas èsser legit o conten pas d'informacions de "
+#~ "connexion VPN reconegudas\n"
+#~ "\n"
+#~ "Error : %s."
+
+#~ msgid "unknown error"
+#~ msgstr "Error desconeguda"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Causissètz un certificat d'una autoritat de certificacion..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Certificat del C_A :"
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager per GNOME"
 
@@ -4756,30 +5237,6 @@ msgstr "_Tipe :"
 #~ 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"
 
@@ -4927,12 +5384,6 @@ msgstr "_Tipe :"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "Adreças automaticas solament (PPP)"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Impossible de cargar l'interfàcia d'utilizaire WiMAX."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Connexion WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4956,9 +5407,6 @@ msgstr "_Tipe :"
 #~ msgid "Error: %s"
 #~ msgstr "Error : %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Fracàs de creacion de la connexion DUN : %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Vòstre telefòn es prèst per son utilizacion"
 
@@ -4994,15 +5442,6 @@ msgstr "_Tipe :"
 #~ msgid "%s Network"
 #~ msgstr "Ret %s"
 
-#~ msgid "Yes"
-#~ msgstr "Òc"
-
-#~ msgid "No"
-#~ msgstr "Non"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS segondària :"
-
 #~ msgid "Wired network"
 #~ msgstr "Ret filara"
 
@@ -5019,9 +5458,6 @@ msgstr "_Tipe :"
 #~ "Aqueste programa fa partida de NetworkManager (http://projects.gnome.org/"
 #~ "NetworkManager)."
 
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciari :"
-
 #~ msgid "_Save..."
 #~ msgstr "_Enregistrar..."
 
@@ -5154,6 +5590,3 @@ msgstr "_Tipe :"
 
 #~ msgid "error getting bus connection"
 #~ msgstr "erreur lors de la modification de la connexion"
-
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS primaire :"
diff --git a/po/or.po b/po/or.po
index b315e5c6..4ce85f0f 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-12-02 05:43-0500\n"
 "Last-Translator: mgiri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
@@ -20,51 +21,60 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "%s ନେଟୱର୍କ"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
 msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗ ସଂରଚନାକୁ ପରିଚାଳନା କରନ୍ତୁ ଏବଂ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "ଅସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -72,29 +82,30 @@ msgid ""
 msgstr ""
 "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ନେଟୱର୍କ ଉପଲବ୍ଧ ବିଜ୍ଞପ୍ତିକୁ ଲୁଚାଇ ଦିଅନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "ଷ୍ଟାମ୍ପ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "ବିନ୍ୟାସକୁ ଗୋଟିଏ ନୂତନ ସଂସ୍କରଣକୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ଉଚିତ କି ନୁହଁ ତାହା ନିର୍ଦ୍ଧାରଣ କରୁଅଛି।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -102,162 +113,175 @@ msgstr ""
 "ଆପଲେଟ ବ୍ୟବହାର କରୁଥିବା ସମୟରେ ଏଡହକ ନେଟୱର୍କଗୁଡ଼ିକର ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ "
 "କରନ୍ତୁ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "ତାରଯୁକ୍ତ 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "ସଂଯୋଗ କରନ୍ତୁ (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "ନେଟୱର୍କ ନାମ (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "ଏଡ-ହକ"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "ଅଜଣା"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "ଅସଂଯୋଜିତ"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ଏହି ସନ୍ଦେଶକୁ ପୁଣିଥରେ ଦର୍ଶାନ୍ତୁ ନାହିଁ"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -267,7 +291,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -286,7 +310,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ବନ୍ଦ ହୋଇଯାଇଛି।"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅବୈଧ ସଂରଚନାରେ ପରିବର୍ତ୍ତିତ ହୋଇଛି।"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସଂଯୋଗର ସମୟ ସମାପ୍ତ ପାଇଁ ପ୍ରୟାସ କରୁଅଛି।"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଉଚିତ ସମୟରେ ଆରମ୍ଭ ହୋଇନଥିଲା।"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି।"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସେଠାରେ କୌଣସି ବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟ ନଥିଲା।"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "ଅବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକ ହେତୁ VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -350,7 +374,7 @@ msgstr ""
 "\n"
 "VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -358,19 +382,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN ଲଗଇନ ସନ୍ଦେଶ"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -383,7 +407,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -396,631 +420,660 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ (ଫର୍ମୱେର ଅନୁପସ୍ଥିତ)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ଉପକରଣ ପରିଚାଳିତ ନୁହଁ"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "କୌଣସି ନେଟୱର୍କ ଉପକରଣ ଉପଲବ୍ଧ ନାହିଁ"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN ବିନ୍ୟାସ କରନ୍ତୁ (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଚାଲୁନାହିଁ..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ନେଟୱର୍କିଙ୍ଗ ନିଷ୍କ୍ରିୟ ହୋଇଛି"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "ବେତାର ସଂଯୋଗକୁ ସକ୍ରିୟ କରନ୍ତୁ (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "ସଂଯୋଗ ସୂଚନା (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "ସଂଯୋଗଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "ବିବରଣୀ (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ '%s' ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ଅସଂଯୋଜିତ"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି।"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' ପାଇଁ ନେଟୱର୍କ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' ପାଇଁ VPN ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ଭୁଲ PUK ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ଭୁଲ PIN ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "ଅନଲକ ସଂକେତ ପଠାଉଅଛି..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ଉପଲବ୍ଧ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "ସଂଯୋଗ ସ୍ଥାପନ ହୋଇସାରିଛି"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ଆପମ ବର୍ତ୍ତମାନ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବନ୍ଧନ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବ୍ରିଜ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ଆପମ ବର୍ତ୍ତମାନ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରସ୍ତୁତ କରୁଅଛି '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଇଥରନେଟ"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ତାରଯୁକ୍ତ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' ପାଇଁ ଗୋଟିଏ ତାରଯୁକ୍ତ ନେଟୱର୍କ ଠିକଣା ପାଇବା ପାଇଁ ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ବୈଧିକରଣ"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(କିଛି ନାହିଁ)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
 msgstr[1] "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "ବେତାର ସଂଯୋଗକୁ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "ଅଧିକ ନେଟୱର୍କଗୁଡ଼ିକ"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଅଛି"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ଗୋଟିଏ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିବା ପାଇଁ ଏହି ଚିତ୍ରସଂକେତ ଉପରେ କ୍ଲିକ କରନ୍ତୁ"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ୱାଇଫାଇ ନେଟୱର୍କ '%s' ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' ପାଇଁ ନେଟୱର୍କ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "ସଂଯୋଗ ସୂଚନା ଦର୍ଶାଇବାରେ ତ୍ରୁଟି:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ଗତିଜ WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 #, fuzzy
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 #, fuzzy
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ଠିକଣା"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ବ୍ରୋଡକାଷ୍ଟ ଠିକଣା"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 #, fuzzy
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "ସବନେଟ ମାସ୍କ"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ପ୍ରାଥମିକ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ଦ୍ବିତୀୟକ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ତୃତୀୟ DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ଇଥରନେଟ (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ସାଧାରଣ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ଅନ୍ତରାପୃଷ୍ଠ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ହାର୍ଡୱେର ଠିକଣା"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ଚାଳକ"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ବେଗ"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "ସୁରକ୍ଷା:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପଥ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "ପ୍ରକାର (_T):"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "ପ୍ରବେଶ ଦ୍ୱାର"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "ଚାଳକ ନାମ (_U):"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "ସଂଯୋଗ (_n):"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "କୌଣସି ବୈଧ ସକ୍ରିୟ ସଂଯୋଗ ମିଳିଲା ନାହିଁ!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Copyright © 2004-2012 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ଉପକରଣ ଏବଂ ସଂଯୋଗଗୁଡ଼ିକୁ ପରିଚାଳନା କରିବା ପାଇଁ ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ର ଆପଲେଟ।"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ୱେବସାଇଟ"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (ଗ୍ଲେଡ଼ ଫାଇଲ ମିଳିଲା ନାହିଁ)।"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ଅନୁପସ୍ଥିତ ଉତ୍ସଗୁଡ଼ିକ"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s' ସହିତ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1029,27 +1082,27 @@ msgstr ""
 "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PIN ସଂକେତ ଆବଶ୍ୟକ କରିଥାଏ।"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 #, fuzzy
 msgid "PIN code:"
 msgstr "PIN ସଂକେତ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 #, fuzzy
 msgid "Show PIN code"
 msgstr "PIN ସଂକେତ ଦର୍ଶାନ୍ତୁ"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1058,39 +1111,46 @@ msgstr ""
 "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PUK ସଂକେତ ଆବଶ୍ୟକ କରିଥାଏ।"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 #, fuzzy
 msgid "PUK code:"
 msgstr "PUK ସଂକେତ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 #, fuzzy
 msgid "New PIN code:"
 msgstr "ନୂତନ PIN ସଂକେତ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 #, fuzzy
 msgid "Re-enter new PIN code:"
 msgstr "ନୂତନ PIN ସଂକେତକୁ ପୁଣିଥରେ ଭରଣ କରନ୍ତୁ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 #, fuzzy
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ସଂଯୋଗ ସୂଚନା"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1099,42 +1159,42 @@ msgstr ""
 "IP ଠିକଣା ଆପଣ କମ୍ପୁଟରକୁ ନେଟୱର୍କରେ ଚିହ୍ନିପାରିଛି।  ଗୋଟିଏ IP ଠିକଣା ଯୋଗ କରିବା ପାଇଁ \"Add\" ବଟନକୁ "
 "କ୍ଲିକ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "ଅପସାରଣ କରନ୍ତୁ (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ମିଳିଥିବା ପଥକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "ଏହି ସଂଯୋଗକୁ କେବଳ ଏହି ନେଟୱର୍କରେ ଥିବା ଉତ୍ସଗୁଡିକ ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ (_o)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1142,17 +1202,17 @@ msgstr ""
 "ଯଦି ସକ୍ରିୟ ଅଛି, ତେବେ ଏହି ସଂଯୋଗକୁ କଦାପି ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନେଟୱର୍କ ସଂଯୋଗ ଭାବରେ ବ୍ୟବହାର କରାଯିବ "
 "ନାହିଁ।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1160,85 +1220,100 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "ସର୍ଭିସ (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "ରାଉଣ୍ଡ-ରବିନ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "ସକ୍ରିୟ ନକଲ ସଂରକ୍ଷଣ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ବ୍ରୋଡକାଷ୍ଟ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "ଅନୁକୂଳ ପରିବହନ ଭାର ସନ୍ତୁଳନ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "ଅନୁକୂଳ ଭାର ସନ୍ତୁଳନ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ପରାମର୍ଶିତ)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "ଅବସ୍ଥା (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "ପୁନରାବୃତ୍ତି ନିରୀକ୍ଷଣ କରୁଅଛି (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "ଲିଙ୍କ ନିରୀକ୍ଷଣ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP ଲକ୍ଷ୍ଯସ୍ଥଳ (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1246,128 +1321,180 @@ msgstr ""
 "IP ଠିକଣା, ଅଥବା IP ଠିକଣାଗୁଡ଼ିକର କୋମା ଦ୍ୱାରା ପୃଥକ ତାଲିକା, ଲିଙ୍କସ୍ଥିତି ଯାଞ୍ଚ କରିବା ସମୟରେ "
 "ଦେଖିଥାଏ।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "ଲିଙ୍କ ଅପ୍‌ ବିଳମ୍ବ (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "ପ୍ରାଥମିକ DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MTU (_M):"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "ବାଇଟଗୁଡିକ"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
-msgid "_Hairpin mode:"
+msgid "_Hairpin mode"
 msgstr "ପରିବହନ ଧାରା (_T):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
-msgid "_Forward delay:"
+msgid "_Forward delay"
 msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 #, fuzzy
 msgid "s"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "ସ୍ବୟଂଚାଳିତ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1378,435 +1505,529 @@ msgstr ""
 "connection is activated on.  This feature is known as MAC cloning or "
 "spoofing.  Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ଠିକଣା"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ଠିକଣା"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_n):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "ହାର୍ଡୱେର ଠିକଣା:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ଗୋଟିଏ ଅଜଣା ତ୍ରୁଟି ହେତୁ ସଂଯୋଗ ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରିବାରେ ବିଫଳ।"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ଏହି ସଂଯୋଗ ପାଇଁ 802.1X ସୁରକ୍ଷାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ଚାଳକ ନାମ (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "ସର୍ଭିସ (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ଅନ୍ତରାପୃଷ୍ଠ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "ସ୍ବୟଂଚାଳିତ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ମୋଡିହୋଇଥିବା ଯୁଗଳ (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "ସଂଲଗ୍ନକ ଏକକ ଅନ୍ତରାପୃଷ୍ଠ (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "ମେଡିଆ ନିର୍ଭରଶୀଳ ହୋଇନଥିବା ଅନ୍ତରାପୃଷ୍ଠ (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ହସପତ ପୁ୍ତିକା"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "ସଂଯୋଗିକୀ (_P):"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "ସର୍ଭିସ (_S):"
+msgid "_Port"
+msgstr "ସଂଯୋଗିକୀ (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ବ୍ରୋଡକାଷ୍ଟ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ଗତି (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "ସମ୍ପୂର୍ଣ୍ଣ ଡୁପ୍ଲେକ୍ସ (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "କିଛି ନୁହେଁ"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ତାରଯୁକ୍ତ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "ସଂଯୋଗ ସୂଚନା (_I)"
+msgid "_Metered connection"
+msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୁକ୍ତ (_a)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1815,7 +2036,7 @@ msgstr ""
 "IP ଠିକଣା ଆପଣ କମ୍ପୁଟରକୁ ନେଟୱର୍କରେ ଚିହ୍ନିପାରିଛି।  ଗୋଟିଏ IP ଠିକଣା ଯୋଗ କରିବା ପାଇଁ \"Add\" ବଟନକୁ "
 "କ୍ଲିକ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1823,129 +2044,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "ଠିକଣା"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ପରିବହନ ଧାରା (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ଡେଟାଗ୍ରାମ"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "ସଂଯୁକ୍ତ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "ପରିବହନ ଧାରା (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ଉପକରଣ ନାମ + ନମ୍ବର"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ଇଥରନେଟ (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "ଧାରା (_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "ହସ୍ତକୃତ DNS ସେଟିଙ୍ଗଗୁଡ଼ିକ ସହିତ ସ୍ୱୟଂଚାଳିତ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ଲିଙ୍କ-ଲୋକାଲ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "ଅନ୍ୟ କମ୍ପୁଟର ସହିତ ସହଭାଗ କରାଯାଇଛି"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "ପଦ୍ଧତି (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1956,8 +2181,8 @@ msgstr ""
 "ଅନୁମତି ଦେଇଥାଏ।  ଯଦି ଆପଣ ଗୋଟିଏ DHCP କ୍ଲାଏଣ୍ଟ ପରିଚାୟକଙ୍କୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଚାହାନ୍ତି, ତେବେ "
 "ଏହାକୁ ଏଠାରେ ଭରଣ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1965,26 +2190,26 @@ msgstr ""
 "ହୋଷ୍ଟ ନାମଗୁଡ଼ିକୁ ସମାଧାନ କରିବା ସମୟରେ ବ୍ୟବହୃତ ଡମେନଗୁଡ଼ିକ। ଏକାଧିକ ଡମେନକୁ ପୃଥକ କରିବା ପାଇଁ ନିର୍ଦ୍ଦେଶ "
 "ବ୍ୟବହାର କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP କ୍ଲାଏଣ୍ଟ ID (_H):"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "ପରିସରଗୁଡ଼ିକୁ ସନ୍ଧାନ କରନ୍ତୁ (_S):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS ସର୍ଭରଗୁଡ଼ିକ (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1992,12 +2217,12 @@ msgstr ""
 "ହୋଷ୍ଟ ନାମଗୁଡ଼ିକୁ ସମାଧାନ କରିବା ପାଇଁ ବ୍ୟବହୃତ ଡମେନ ନାମ ସର୍ଭରଗୁଡ଼ିକର IP ଠିକଣା। ଏକାଧିକ ଡମେନ ନାମ "
 "ସର୍ଭର ଠିକଣାଗୁଡ଼ିକୁ ପୃଥକ କରିବା ପାଇଁ କୋମା ବ୍ୟବହାର କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ଏହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ କରିବା ପାଇଁ IPv4 ଠିକଣା ଆବଶ୍ୟକ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2005,25 +2230,34 @@ msgstr ""
 "IPv6-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ ଅନୁମତି "
 "ଦିଅନ୍ତୁ ଯଦି IPv4 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv6 ସଂରଚନା ସଫଳ ହୋଇଥାଏ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "ନିଷ୍କ୍ରିୟ ହୋଇଛି"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2033,16 +2267,20 @@ msgstr ""
 "ହୋଷ୍ଟ ନାମଗୁଡ଼ିକୁ ସମାଧାନ କରିବା ପାଇଁ ବ୍ୟବହୃତ ଡମେନ ନାମ ସର୍ଭରଗୁଡ଼ିକର IP ଠିକଣା। ଏକାଧିକ ଡମେନ ନାମ "
 "ସର୍ଭର ଠିକଣାଗୁଡ଼ିକୁ ପୃଥକ କରିବା ପାଇଁ କୋମା ବ୍ୟବହାର କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ଏହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ କରିବା ପାଇଁ IPv6 ଠିକଣା ଆବଶ୍ୟକ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2050,764 +2288,866 @@ msgstr ""
 "IPv4-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ ଅନୁମତି "
 "ଦିଅନ୍ତୁ ଯଦି IPv6 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv4 ସଂରଚନା ସଫଳ ହୋଇଥାଏ।"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metric"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "ସଂଖ୍ୟା (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 #, fuzzy
 msgid "Advanced"
 msgstr "<b>ଉନ୍ନତ</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ନେଟୱର୍କ ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "ସ୍ଥାନୀୟ ନେଟୱର୍କ ଉପଲବ୍ଧ ନହେଲେ ରୋମିଙ୍ଗକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "ଅନୁମତି ପ୍ରାପ୍ତ ପଦ୍ଧତିଗୁଡ଼ିକ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 #, fuzzy
 msgid "Configure _Methods…"
 msgstr "Methods&#x2026; କୁ ବିନ୍ୟାସ କରନ୍ତୁ (_M)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "<b>ସଙ୍କୁଚନ</b>"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ବିନ୍ଦୁ-ରୁ-ବିନ୍ଦୁ ସଂଗୁପ୍ତକରଣକୁ ବ୍ୟବହାର କରନ୍ତୁ (MPPE) (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-ବିଟ ସଂଗୁପ୍ତ କରଣ ଆବଶ୍ୟକ (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Use _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD ତଥ୍ୟ ସଙ୍କୋଚନକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "ମୂଲ୍ୟ ହ୍ରାସକାରୀ ତଥ୍ୟ ସଙ୍କୋଚନକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP ଶୀର୍ଷକ ସଙ୍କୋଚନକୁ ବ୍ୟବହାର କରନ୍ତୁ (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP ପ୍ରତିଧ୍ୱନି ପ୍ୟାକେଟଗୁଡ଼ିକୁ ପଠାନ୍ତୁ (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ପଦ୍ଧତି (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ପଦ୍ଧତି (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "<b>ଉନ୍ନତ</b>"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "ସୁରକ୍ଷା (_S):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "ଲିଙ୍କ ଅପ୍‌ ବିଳମ୍ବ (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP ଲକ୍ଷ୍ଯସ୍ଥଳ (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP ଲକ୍ଷ୍ଯସ୍ଥଳ (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ଇଥରନେଟ (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଇଥରନେଟ"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 #, fuzzy
 msgid "Any L3 protocol"
 msgstr "WPA ପ୍ରୋଟୋକଲ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 #, fuzzy
 msgid "Any L4 protocol"
 msgstr "WPA ପ୍ରୋଟୋକଲ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "ହାର୍ଡୱେର ଠିକଣା:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "ହାର୍ଡୱେର ଠିକଣା:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ପରିବହନ ଶକ୍ତି (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ପରିବହନ ଶକ୍ତି (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_n):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ଉପକରଣ ନାମ + ନମ୍ବର"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + ନମ୍ବର"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "ସୁରକ୍ଷା:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ଏଡ-ହକ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ପରିବହନ ଶକ୍ତି (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "ହାର (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ଚ୍ୟାନେଲ (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ବ୍ୟାଣ୍ଡ (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "<b>ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିଗୁଡ଼ିକ</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "ବିସ୍ତାରଣୀୟ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ ସଂସ୍କରଣ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2816,445 +3156,484 @@ msgstr ""
 "<i>ଅଧିକାଂଶ ପରିସ୍ଥିତିରେ, ପ୍ରଦାତାର PPP ସର୍ଭରଗୁଡ଼ିକ ସମସ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିକୁ ସମର୍ଥନ କରିବ। ଯଦି ସଂଯୋଗ "
 "ବିଫଳ ହୁଏ, ତେବେ କିଛି ପଦ୍ଧତିର ସମର୍ଥନକୁ ନିଷ୍କ୍ରିୟ କରି ଚେଷ୍ଟା କରନ୍ତୁ।</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ଇନଫିନିବ୍ୟାଣ୍ଡ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "ବନ୍ଧନ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ବ୍ରିଜ"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN ପ୍ଲଗଇନ VPN ସଂଯୋଗକୁ ସଠିକ ଭାବରେ ଆମଦାନୀ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
-"\n"
-"ତ୍ରୁଟି: କୌଣସି VPN ସର୍ଭିସ ପ୍ରକାର ନାହିଁ।"
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN ସଂଯୋଗକୁ ଆମଦାନୀ କରାଯାଇପାରିବ ନାହିଁ"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ଫାଇଲ '%s' କୁ ପଢ଼ିହେଲା ନାହିଁ କିମ୍ବା କୌଣସି ପରିଚିତ VPN ସଂଯୋଗ ସୂଚନା ଧାରଣ କରିନଥାଏ\n"
+"VPN ପ୍ଲଗଇନ VPN ସଂଯୋଗକୁ ସଠିକ ଭାବରେ ଆମଦାନୀ କରିବାରେ ବିଫଳ ହୋଇଛି\n"
 "\n"
-"ତ୍ରୁଟି: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "ଅଜଣା"
+"ତ୍ରୁଟି: କୌଣସି VPN ସର୍ଭିସ ପ୍ରକାର ନାହିଁ।"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ଆମଦାନୀ ପାଇଁ ଫାଇଲ ଚୟନ କରନ୍ତୁ"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ହାର୍ଡୱେର"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "ଆଭାସୀ"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ସଂଯୋଗ ସମ୍ପାଦକ ସଂଳାପକୁ ଅଜଣା ତ୍ରୁଟି କାରଣରୁ ଆରମ୍ଭ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "ସଂଯୋଗ ଅପସାରଣ ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ସଂଯୋଗ %s କୁ ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ୍ଚିତ କି?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ଠିକଣା"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "ନେଟମାସ୍କ"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ପ୍ରବେଶ ଦ୍ୱାର"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ଉପସର୍ଗ"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "ସମ୍ପାଦନ କରୁଅଛି %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "ବେନାମୀ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "ସଂଯୋଗ ନାମ (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "ସଂଯୋଗ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "ସଂଯୋଗ ସମ୍ପାଦକ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (.ui ଫାଇଲ ମିଳି ନଥିଲା)।"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ଏହି ସଂଯୋଗରେ କରାଯାଇଥିବା କୌଣସି ପରିବର୍ତ୍ତନକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ଏହି ଯନ୍ତ୍ରର ସମସ୍ତ ଚାଳକମାନଙ୍କ ପାଇଁ ଏହି ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ବୈଧିକରଣ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ସଂଯୋଗକୁ ସମ୍ପାଦନ କରାଯାଇପାରିଲା ନାହିଁ"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "ସଂଯୋଗ ସମ୍ପାଦକ ସଂଳାପ ନିର୍ମାଣ କରିବାରେ ତ୍ରୁଟି।"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "ସଂଯୋଗ ନାମ (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "ରପ୍ତାନୀ କରନ୍ତୁ (_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "ନାମପଟି"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "ନାମପଟି"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "କଦାପି ନୁହଁ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ବର୍ତ୍ତମାନ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ମିନଟ ପୂର୍ବେ"
 msgstr[1] "%d ମିନଟ ପୂର୍ବେ"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ଘଣ୍ଟା ପୂର୍ବରୁ"
 msgstr[1] "%d ଘଣ୍ଟା ପୂର୍ବରୁ"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ଦିନ ପୂର୍ବେ"
 msgstr[1] "%d ଦିନ ପୂର୍ବେ"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ମାସ ପୂର୍ବେ"
 msgstr[1] "%d ମାସ ପୂର୍ବେ"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ବର୍ଷ ପୂର୍ବେ"
 msgstr[1] "%d ବର୍ଷ ପୂର୍ବେ"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "ସଂଯୋଗ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ନାମ"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ଅନ୍ତିମ ଥର ବ୍ୟବହୃତ"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ଅପସାରଣ କରନ୍ତୁ"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ଅସମର୍ଥିତ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରକାର।"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "ସଂଯୋଗ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X ସୁରକ୍ଷା"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Wi-Fi ସୁରକ୍ଷା ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "ଏହି ସଂଯୋଗ ପାଇଁ 802.1X ସୁରକ୍ଷାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ବ୍ଲୁଟୁଥ ଉପକରଣକୁ ଖୋଜି ପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 #, fuzzy
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "ଆପଣ ପ୍ରସ୍ତୁତ କରିବାକୁ ଚାହୁଁଥିବା ସଂଯୋଗର ପ୍ରକାର ବାଛନ୍ତୁ:"
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "ବେତାର ନେଟୱର୍କ"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ପ୍ରାଥମିକ DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
@@ -3262,35 +3641,40 @@ msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 #, fuzzy
 msgid "Bridge Port"
 msgstr "ବ୍ରିଜ"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3300,57 +3684,56 @@ msgstr ""
 "ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ ନେଟୱର୍କ ଉପକରଣରେ "
 "ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "ତାରଯୁକ୍ତ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ଇଥରନେଟ (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3361,185 +3744,187 @@ msgstr ""
 "ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ ନେଟୱର୍କ ଉପକରଣରେ "
 "ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (VPN) ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (PPPoE) ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (DHCP) ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "କେବଳ ସଂଯୋଗ-ସ୍ଥାନୀୟ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "DNS ସର୍ଭରଗୁଡ଼ିକ (_D):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "ପରିସରଗୁଡ଼ିକୁ ସନ୍ଧାନ କରନ୍ତୁ (_S):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ପାଇଁ IPv4 ପଥକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 ସଂରଚନା"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ପାଇଁ IPv6 ପଥକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 ସଂରଚନା"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL ସଂଯୋଗ %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s ସ୍ଲେଭ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ଅସମର୍ଥିତ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରକାର।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ପ୍ରଦାତା ପ୍ରକାରକୁ ବାଛନ୍ତୁ"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3548,7 +3933,7 @@ msgstr ""
 "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତା ବ୍ୟବହାର କରୁଥିବା ପ୍ରଯୁକ୍ତିଜ୍ଞାନକୁ ବାଛନ୍ତୁ।  ଯଦି ଆପଣ ନିଶ୍ଚିତ "
 "ନୁହଁନ୍ତି, ତେବେ ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ପଚାରନ୍ତୁ।"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ମୋର ପ୍ରଦାତା GSM-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, GPRS, EDGE, UMTS, HSDPA) "
@@ -3556,85 +3941,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ମୋର ପ୍ରଦାତା CDMA-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, 1xRTT, EVDO) ( _C)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ପାଇଁ PPP ବୈଧିକରଣ ପଦ୍ଧତିକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ବିନ୍ଯାସ"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "ତାରଯୁକ୍ତ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
@@ -3642,11 +4023,11 @@ msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
@@ -3654,68 +4035,68 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "VLAN ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' ପାଇଁ VPN ପ୍ଲଗଇନ ସର୍ଭିସକୁ ସନ୍ଧାନ କରାଯାଇପାରିଲା ନାହିଁ।"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' ପାଇଁ VPN ପ୍ଲଗଇନ ସର୍ଭିସକୁ ସନ୍ଧାନ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' ପାଇଁ VPN ପ୍ଲଗଇନ ସର୍ଭିସକୁ ସନ୍ଧାନ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3724,7 +4105,7 @@ msgstr ""
 "ଏହି ବିକଳ୍ପ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା BSSID ଦ୍ୱାରା ଉଲ୍ଲେଖ କରାଯାଇଥିବା ବେତାର ଅଭିଗମ୍ୟ ବିନ୍ଦୁରେ "
 "ସଂଯୋଗକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ (AP)।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3734,98 +4115,96 @@ msgstr ""
 "ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ ନେଟୱର୍କ ଉପକରଣରେ "
 "ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ବିଟ କି (Hex ଅଥବା ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ଗତିଜ WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ଉଦ୍ଦୋଗ"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Wi-Fi ସୁରକ୍ଷା ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ; Wi-Fi ସଂରଚନା ଅନୁପସ୍ଥିତ ଅଛି।"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "ବେତାର ସୁରକ୍ଷା"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi ସୁରକ୍ଷା ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" ନାମକ ଗୋଟିଏ ଫାଇଲ ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି।"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ବଦଳାନ୍ତୁ (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "ଆପଣ %s କୁ ଆପଣ ସଂରକ୍ଷଣ କରୁଥିବା VPN ସଂଯୋଗ ସହିତ ବଦଳାଇବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN ସଂଯୋଗକୁ ରପ୍ତାନୀ କରାଯାଇପାରିବ ନାହିଁ"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3836,225 +4215,106 @@ msgstr ""
 "\n"
 "ତ୍ରୁଟି: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN ସଂଯୋଗକୁ ରପ୍ତାନୀ କରନ୍ତୁ..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "ଖୋଲନ୍ତୁ (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ସଂଯୋଗ ସୂଚନା"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ଆପଣଙ୍କର ଉପକରଣ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ଆପଣଙ୍କର ପ୍ରଦାତା:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "ଆପଣଙ୍କର ଯୋଜନା:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
-"ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ "
-"ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
-"ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର >> ପସନ୍ଦ "
-"ତାଲିକାରୁ ବାଛନ୍ତୁ।"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ତାଲିକାଭୁକ୍ତ ହୋଇନଥିବା"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ଆପଣଙ୍କର ଯୋଜନାକୁ ବାଛନ୍ତୁ (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "ବଚ୍ଛିତ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ) (_A):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"ଚେତାବନୀ: ଗୋଟିଏ ଭୁଲ ଯୋଜନା ବାଛିବା ଦ୍ୱାରା ଆପମଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ବିଲିଙ୍ଗ ସମସ୍ୟା "
-"ଦେଖାଦେଇପାରେ କିମ୍ବା ସଂଯୋଗକୁ ବାରଣ କରିପାରେ।\n"
-"\n"
-"ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ଆପଣଙ୍କ ଯୋଜନାର "
-"APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ଆପଣଙ୍କର ବିଲିଙ୍ଗ ଯୋଜନା ବାଛନ୍ତୁ"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "ମୋର ଯୋଜନା ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ପ୍ରଦାତା ବାଛନ୍ତୁ (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ପ୍ରଦାତା"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ପ୍ରଦାତା:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "ମୋର ପ୍ରଦାତା GSM ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "ମୋର ପ୍ରଦାତା CDMA ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-#, fuzzy
-msgid "Country or Region List:"
-msgstr "ଦେଶ ତାଲିକା:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-#, fuzzy
-msgid "Country or region"
-msgstr "ଦେଶ ତାଲିକା:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ଦେଶକୁ ବାଛନ୍ତୁ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ସ୍ଥାପିତ GSM ଉପକରଣ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ସ୍ଥାପିତ CDMA ଉପକରଣ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4062,231 +4322,310 @@ msgstr ""
 "ସହାୟକ ଆପଣଙ୍କୁ ସହଜରେ ଗୋଟିଏ ସେଲ୍ୟୁଲାର (3G) ନେଟୱର୍କ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ "
 "କରିବାରେ ସାହାଯ୍ୟ କରିବେ।"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ଆପଣ ନିମ୍ନଲିଖିତ ସୂଚନା ଆବଶ୍ୟକ କରିବେ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତାଙ୍କ ନାମ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା ନାମ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(କିଛି ପରିସ୍ଥିତିରେ) ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ଏହି ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ ଗୋଟିଏ ସଂଯୋଗ ନିର୍ମାଣ କରନ୍ତୁ (_t)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ କରନ୍ତୁ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ଦେଶକୁ ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ପ୍ରଦାତା ବାଛନ୍ତୁ (_l):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ମୋର ପ୍ରଦାତା GSM ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ମୋର ପ୍ରଦାତା CDMA ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ଆପଣଙ୍କର ଯୋଜନାକୁ ବାଛନ୍ତୁ (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ବଚ୍ଛିତ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ) (_A):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"ଚେତାବନୀ: ଗୋଟିଏ ଭୁଲ ଯୋଜନା ବାଛିବା ଦ୍ୱାରା ଆପମଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ବିଲିଙ୍ଗ ସମସ୍ୟା "
+"ଦେଖାଦେଇପାରେ କିମ୍ବା ସଂଯୋଗକୁ ବାରଣ କରିପାରେ।\n"
+"\n"
+"ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ଆପଣଙ୍କ ଯୋଜନାର "
+"APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ଆପଣଙ୍କର ବିଲିଙ୍ଗ ଯୋଜନା ବାଛନ୍ତୁ"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ଆପଣଙ୍କର ଉପକରଣ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ଆପଣଙ୍କର ପ୍ରଦାତା:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "ଆପଣଙ୍କର ଯୋଜନା:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ "
+"ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର >> ପସନ୍ଦ "
+"ତାଲିକାରୁ ବାଛନ୍ତୁ।"
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(କିଛି ନାହିଁ)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "ଅଜଣା"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "ଖୋଲନ୍ତୁ (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "ପ୍ରତ୍ୟେକ ଥର ଏହି ପ୍ରବେଶ ସଂକେତକୁ ପଚାରନ୍ତୁ (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s' ସହିତ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+msgid "Sh_ow passwords"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
+msgid "_Secondary Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "ଗତିଜ WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ବେତାର ନେଟୱର୍କ ବୈଧିକରଣ ଆବଶ୍ୟକ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "ବେତାର ନେଟୱର୍କ ପାଇଁ ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4295,38 +4634,57 @@ msgstr ""
 "ଆପଣ ସଂଯୋଗ ସ୍ଥାପନ କରିବାକୁ ଚାହୁଁଥିବା ଲୁକ୍କାୟିତ ବେତାର ନେଟୱର୍କର ନାମ ଏବଂ ସୁରକ୍ଷା ବିବରଣୀଗୁଡ଼ିକୁ ଭରଣ "
 "କରନ୍ତୁ।"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "ସଂଯୋଗ (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ପ୍ରଦାତା:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ଦେଶ ତାଲିକା:"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "ତାରଯୁକ୍ତ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4336,17 +4694,42 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ସୁରକ୍ଷା (_S):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ନେଟୱର୍କ ନାମ (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ସଂଯୋଗ (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ବ୍ୟବହାର ବିଧି:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 #, fuzzy
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
@@ -4355,7 +4738,7 @@ msgstr ""
 "ଏହି ପ୍ରଗ୍ରାମଟି NetworkManager ର ଗୋଟିଏ ଉପାଦାନ (http://projects.gnome.org/"
 "NetworkManager)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4363,433 +4746,466 @@ msgstr ""
 "ନିର୍ଦ୍ଦେଶ-ନାମା କାର୍ଯକଳାପ ପାଇଁ ଏହା ଇଚ୍ଛୁକ ନୁହଁ କିନ୍ତୁ ଏହା ପରିବର୍ତ୍ତେGNOME ଡେସ୍କଟପ ପରିବେଶରେ "
 "ଚାଲିଥାଏ।"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ସକ୍ରିୟ ହୋଇନାହିଁ"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ପଞ୍ଜିକୃତ ହୋଇନାହିଁ"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ସନ୍ଧାନ କରୁଅଛି"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ପଞ୍ଜିକରଣ ବାରଣ ହୋଇଛି"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ରୋମିଙ୍ଗ)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ରୋମିଙ୍ଗ)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN ସଂକେତ ଆବଶ୍ୟକ"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ PIN ସଂକେତ ଆବଶ୍ୟକ"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ରୋମିଙ୍ଗ"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "DSL ସଂଯୋଗ %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER କିମ୍ବା PEM ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, କିମ୍ବା PKCS#12 ବ୍ୟକ୍ତିଗତ କିଗୁଡ଼ିକ (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ଗୋଟିଏ PAC ଫାଇଲ ଚୟନ କରନ୍ତୁ..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ଫାଇଲଗୁଡ଼ିକ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "ଅଜଣା ପରିଚୟ (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "ଅଜଣା ପରିଚୟ (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
-msgid "PAC _file:"
+msgid "PAC _file"
 msgstr "PAC ଫାଇଲ (_P):"
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "ଆଭ୍ୟନ୍ତରୀଣ ବୈଧିକରଣ (_n):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ସ୍ୱୟଂଚାଳିତ PAC ସୁବିଧାକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_A)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "ଗୋଟିଏ ପ୍ରମାଣପତ୍ର ଅଧିକାରୀ ପ୍ରମାଣପତ୍ର ବାଛନ୍ତୁ..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "PEAP ସଂସ୍କରଣ (_P):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "ପରିଚୟ (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "ତୀବ୍ର"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ଟନେଲଯୁକ୍ତ TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "ସୁରକ୍ଷିତ EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "ବୈଧିକରଣ (_A):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#, fuzzy
-msgid "1 (Default)"
-msgstr ""
-"1 (ପୂର୍ବନିର୍ଦ୍ଧାରିତ)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr ""
 "ଖୋଲା ତନ୍ତ୍ର\n"
 "ସହଭାଗୀ କି"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 #, fuzzy
 msgid "Shared Key"
 msgstr ""
 "ଖୋଲା ତନ୍ତ୍ର\n"
 "ସହଭାଗୀ କି"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+#, fuzzy
+msgid "1 (Default)"
+msgstr ""
+"1 (ପୂର୍ବନିର୍ଦ୍ଧାରିତ)\n"
+"2\n"
+"3\n"
+"4"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "କି (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "କି ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP ଅନୁକ୍ରମଣିକା (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ପ୍ରକାର (_T):"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
+
+#~ msgid "Ignored"
+#~ msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "ଗୋଟିଏ ଅଜଣା ତ୍ରୁଟି ହେତୁ ସଂଯୋଗ ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରିବାରେ ବିଫଳ।"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "ସଂଯୋଗ ସୂଚନା (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN ସଂଯୋଗକୁ ଆମଦାନୀ କରାଯାଇପାରିବ ନାହିଁ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ଫାଇଲ '%s' କୁ ପଢ଼ିହେଲା ନାହିଁ କିମ୍ବା କୌଣସି ପରିଚିତ VPN ସଂଯୋଗ ସୂଚନା ଧାରଣ କରିନଥାଏ\n"
+#~ "\n"
+#~ "ତ୍ରୁଟି: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "ଅଜଣା"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "ଗୋଟିଏ ପ୍ରମାଣପତ୍ର ଅଧିକାରୀ ପ୍ରମାଣପତ୍ର ବାଛନ୍ତୁ..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "ନେଟୱର୍କ ପରିଚାଳକ"
 
@@ -4983,15 +5399,6 @@ msgstr "ପ୍ରକାର (_T):"
 #~ msgid "Unknown"
 #~ msgstr "ଅଜଣା"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ଦ୍ବିତୀୟକ DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ତୃତୀୟ DNS:"
-
-#~ msgid "translator-credits"
-#~ msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
-
 #~ msgid "_Help"
 #~ msgstr "ସହାୟତା (_H)"
 
@@ -5129,9 +5536,6 @@ msgstr "ପ୍ରକାର (_T):"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "ଗୁଣଧର୍ମ '%s' / '%s' ଅବୈଧ: %d"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୁକ୍ତ (_a)"
-
 #~ msgid "Available to all users"
 #~ msgstr "ସମସ୍ତ ଚାଳକ ମାନଙ୍କ ପାଇଁ ଉପଲବ୍ଧ"
 
diff --git a/po/pa.po b/po/pa.po
index 1bf4a332..5c882a21 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Network"
-"Manager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2017-07-11 16:17+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2017-07-23 11:57-0600\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
@@ -19,252 +19,248 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3186
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਦਾ ਪਰਬੰਧ ਕਰੋ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "ਰਾਅ ਸੰਰਚਨਾ"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "ਆਪਣੀ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਦਾ ਪਰਬੰਧ ਕਰੋ ਅਤੇ ਬਦਲੋ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr ""
-"ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ"
-" ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਅਸਮਰੱਥ ਕਰੋ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr ""
-"ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ"
-" ਸੱਚ ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਕਰੋ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
-"ਜੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਜਾਂ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ"
-" ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ "
+"ਜੇ VPN ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਜਾਂ ਡਿਸ-ਕਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ "
 "(ture) ਸੈਟ ਕਰੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਸੂਚਨਾ ਨਾ ਦਿਓ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr ""
-"ਜੇ Wi-Fi ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ"
-" ਸੱਚ ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ Wi-Fi ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "ਸਟੈਂਪ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
-msgstr ""
-"ਪਤਾ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ ਕਿ ਸੈਟਿੰਗ ਨਵੇਂ ਵਰਜਨ ਲਈ ਮਾਈਗਰੇਟ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
+msgstr "ਪਤਾ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ ਕਿ ਸੈਟਿੰਗ ਨਵੇਂ ਵਰਜਨ ਲਈ ਮਾਈਗਰੇਟ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi ਬਣਾਉਣਾ ਅਸਮਰੱਥ ਕਰੋ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
-msgstr ""
-"ਜਦੋਂ ਐਪਲਿਟ ਵਰਤਣ ਦੌਰਾਨ ਐਡ-ਹਾਕ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨ ਲਈ ਸਹੀਂ ਸੈੱਟ ਕਰੋ।"
+msgstr "ਜਦੋਂ ਐਪਲਿਟ ਵਰਤਣ ਦੌਰਾਨ ਐਡ-ਹਾਕ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨ ਲਈ ਸਹੀਂ ਸੈੱਟ ਕਰੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਵੇਖਾਓ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਐਪਲਿਟ ਨਾ ਵੇਖਾਉਣ ਲਈ FALSE ਦਿਉ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA ਸਰਟੀਫਿਕੇਟ ਅਣਡਿੱਠਾ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ"
-" ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ "
 "ਹੋ।"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ"
-" ਚੇਤਾਵਨੀਆਂ ਬੰਦ "
+"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ "
 "ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਕਨੈਕਸ਼ਨ ਐਡੀਟਰ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
-msgstr ""
-"ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਅਤੇ ਜੰਤਰ ਦੇ ਪਰਬੰਧ ਅਤੇ ਸੰਰਚਨਾ ਲਈ ਸਿਸਟਮ"
-" ਸੇਵਾ ਹੈ।"
+msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਅਤੇ ਜੰਤਰ ਦੇ ਪਰਬੰਧ ਅਤੇ ਸੰਰਚਨਾ ਲਈ ਸਿਸਟਮ ਸੇਵਾ ਹੈ।"
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਡਿਵੈਲਪਰ"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.c:209
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "ਰੱਦ ਕਰੋ(_C)"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "ਕਨੈਕਸ਼ਨ(_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ਐਡ-ਹਾਕ"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "ਸੁਰੱਖਿਅਤ।"
 
-#: ../src/applet.c:387
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਜੋੜਨ/ਐਕਟੀਵੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/applet.c:389 ../src/applet.c:443 ../src/applet.c:478
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../src/applet.c:392 ../src/applet.c:481 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ"
 
-#: ../src/applet.c:441
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ਜੰਤਰ ਡਿਸ-ਕਨੈਕਟ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:446
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "ਡਿਸ-ਕਨੈਕਟ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:476
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "ਕਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:804 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/applet.c:894
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +270,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਡਿਸ-ਕਨੈਕਟ ਹੋਇਆ, ਕਿਉਂਕਿ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਰੁਕ ਗਿਆ।"
 
-#: ../src/applet.c:896
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +280,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਵਿਚੇ ਰੋਕਿਆ ਗਿਆ।"
 
-#: ../src/applet.c:898
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +289,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਅਚਾਨਕ ਰੁਕ ਗਈ।"
 
-#: ../src/applet.c:900
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +299,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਨੇ ਅਢੁੱਕਵੀਂ ਸੰਰਚਨਾ ਦਿੱਤੀ।"
 
-#: ../src/applet.c:902
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -312,7 +308,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਕਨੈਕਸ਼ਨ ਕੋਸ਼ਿਸ਼ ਲਈ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ।"
 
-#: ../src/applet.c:904
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +317,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਸਮੇਂ ਸਿਰ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਈ।"
 
-#: ../src/applet.c:906
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +326,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਸ਼ੁਰੂ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੋਈ।"
 
-#: ../src/applet.c:908
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +335,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਕੋਈ ਢੁੱਕਵੇਂ VPN ਸੀਕਰਟ ਨਹੀਂ ਸਨ"
 
-#: ../src/applet.c:910
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +344,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਅਢੁੱਕਵੇਂ VPN ਸੀਕਰਟ ਸਨ।"
 
-#: ../src/applet.c:915
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -357,7 +353,7 @@ msgstr ""
 "\n"
 "VPN ਕਨੈਕਸ਼ਨ “%s“ ਫੇਲ੍ਹ ਹੋਇਆ।"
 
-#: ../src/applet.c:942
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -368,19 +364,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:944
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਬਣਾਇਆ ਗਿਆ ਹੈ।\n"
 
-#: ../src/applet.c:946
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN ਲਾਗਇਨ ਸੁਨੇਹਾ"
 
-#: ../src/applet.c:954 ../src/applet.c:994
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
 
-#: ../src/applet.c:998
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -393,7 +389,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1001
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -406,561 +402,573 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1290
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ਜੰਤਰ ਤਿਆਰ ਨਹੀਂ ਹੈ (ਫਿਰਮਵੇਅਰ ਗੁੰਮ ਹੈ)"
 
-#: ../src/applet.c:1292
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ਜੰਤਰ ਤਿਆਰ ਨਹੀਂ ਹੈ"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1302 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ਡਿਸ-ਕਨੈਕਟ ਹੈ"
 
-#: ../src/applet.c:1318
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ਡਿਸ-ਕਨੈਕਟ ਕਰੋ"
 
-#: ../src/applet.c:1332
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ਜੰਤਰ ਪਰਬੰਧ ਅਧੀਨ ਨਹੀਂ ਹੈ"
 
-#: ../src/applet.c:1405
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ਕੋਈ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਹੀਂ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../src/applet.c:1459
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN ਕਨੈਕਸ਼ਨ"
 
-#: ../src/applet.c:1503
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPN ਸੰਰਚਨਾ(_C)…"
 
-#: ../src/applet.c:1506
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਜੋੜੋ(_A)…"
 
-#: ../src/applet.c:1612
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "ਨੈਟਵਰਕ-ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਜਾ ਰਿਹਾ ਹੈ…"
 
-#: ../src/applet.c:1617 ../src/applet.c:2682
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਅਸਮਰੱਥ ਹੈ"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1827
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1836
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi ਚਾਲੂ(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1845
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਚਾਲੂ(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1857
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ(_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1869
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1877
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "…ਕਨੈਕਸ਼ਨ ਸੋਧੋ"
 
-#: ../src/applet.c:1891
+#: src/applet.c:1895
 msgid "_About"
 msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../src/applet.c:2202
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "ਹੁਣ ਤੁਸੀਂ “%s“ ਨਾਲ ਕਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet.c:2242
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ਡਿਸ-ਕਨੈਕਟ ਹੈ"
 
-#: ../src/applet.c:2243
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਡਿਸ-ਕਨੈਕਟ ਹੈ।"
 
-#: ../src/applet.c:2545
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"
 
-#: ../src/applet.c:2548
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਲਈ ਵਰਤੋਂਕਾਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਂਦੀ ਹੈ…"
 
-#: ../src/applet.c:2551 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "“%s“ ਲਈ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਸਰਗਰਮ ਹੈ"
 
-#: ../src/applet.c:2627
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN ਕਨੈਕਸ਼ਨ “%s“ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"
 
-#: ../src/applet.c:2630
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN ਕਨੈਕਸ਼ਨ “%s“ ਲਈ ਵਰਤੋਂਕਾਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ…"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "“%s“ ਲਈ VPN ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet.c:2636
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਸਰਗਰਮ ਹੈ"
 
-#: ../src/applet.c:2686
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: ../src/applet.c:3287
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਐਪਲਿਟ"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ਗਲਤ PUK ਕੋਡ; ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ਗਲਤ ਪਿੰਨ ਕੋਡ; ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "…ਅਣ-ਲਾਕ ਕੋਡ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ।"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਘਰ ਨੈੱਟਵਰਕ ਨਾਲ ਰਜਿਸਟਰ ਹੋ ਚੁੱਕੇ ਹੋ।"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਰੋਮਿੰਗ (roaming) ਨੈੱਟਵਰਕ ਨਾਲ ਰਜਿਸਟਰ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ”%s” ਲਈ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ”%s” ਸੰਰਚਨਾ ਜਾਰੀ…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ “%s“ ਲਈ ਵਰਤੋਂਕਾਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਂਦੀ ਹੈ…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ”%s” ਸਰਗਰਮ ਹੈ"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ਆਟੋ ਈਥਰਨੈੱਟ"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਲਈ ਤਿਆਰੀ…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ”%s” ਲਈ ਵਰਤੋਂਕਾਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਂਦੀ ਹੈ…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "”%s” ਲਈ ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ”%s” ਸਰਗਰਮ"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:313
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "ਠੀਕ ਹੈ(_O)"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "…ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ(_C)"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਓ…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "ਨਵਾਂ ਕਨੈਕਸ਼ਨ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "ਨਾਕਾਫ਼ੀ ਅਧਿਕਾਰ।"
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi ਨੈੱਟਵਰਕ"
 msgstr[1] "Wi-Fi ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi ਬੰਦ ਹੈ"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi ਨੂੰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਰਾਹੀਂ ਬੰਦ ਕੀਤਾ ਹੈ"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "ਹੋਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ਨੈੱਟਵਰਕ ਮੇਨੂ ਨੂੰ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਵਰਤੋਂ"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "ਹੁਣ ਤੁਸੀਂ Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਨਾਲ ਕਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ”%s” ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਲਈ ਵਰਤੋਂਕਾਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "“%s“ ਲਈ Wi-Fi ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਸਰਗਰਮ: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ “%s“ ਸਰਗਰਮ"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਵੇਖਾਉਣ ਲਈ ਗਲਤੀ:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "ਡਾਇਨੇਮਕ WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "ਹੋਰ ਐਡਰੈੱਸ"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (ਡਿਫਾਲਟ)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ਐਡਰੈੱਸ"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ਬਰਾਡਕਾਸਟ ਐਡਰੈੱਸ"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "ਸਬਨੈੱਟ ਮਾਸਕ"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ਪ੍ਰਾਇਮਰੀ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ਸੈਕੰਡਰੀ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ਤ੍ਰਿਨਰੀ DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ਈਥਰਨੈੱਟ (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ਇੰਟਰਫੇਸ"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ਡਰਾਇਵਰ"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ਸਪੀਡ"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "ਸੁਰੱਖਿਆ:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "ਡਿਫਾਲਟ ਰੂਟ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "ਅਣਡਿੱਠਾ"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "ਹਾਟਸਪਾਟ"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN ਕਿਸਮ"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN ਗੇਟਵੇ"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN ਵਰਤੋਂਕਾਰ ਨਾਂ"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN ਬੈਨਰ"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ਬੇਸ ਕਨੈਕਸ਼ਨ"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "ਕੋਈ ਢੁੱਕਵਾਂ ਐਕਟਿਵ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਲੱਭਿਆ!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -970,171 +978,180 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "ਅਤੇ ਕਈ ਹੋਰ ਕਮਿਊਨਟ ਦੇ ਯੋਗਦਾਨੀ ਅਤੇ ਉਲੱਥਾਕਾਰ"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕਨੈਕਸ਼ਨਾਂ ਦੇ ਪਰਬੰਧ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਐਪਲਿਟ ਹੈ।"
+msgstr "ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕਨੈਕਸ਼ਨਾਂ ਦੇ ਪਰਬੰਧ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਐਪਲਿਟ ਹੈ।"
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵੈੱਬਸਾਈਟ"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ, ੨੦੦੪-੨੦੧੦\n"
 "http://www.satluj.com"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਐਪਲਿਟ ਲੋੜੀਦੇ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ ਸਕਿਆ (.ui ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)।"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ਗੁੰਮ ਸਰੋਤ"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "“%s“ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ। "
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "ਸਿਮ PIN ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "ਸਿਮ PIN ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
 "used."
-msgstr ""
-"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ “%s“ ਲਈ ਸਿਮ PIN ਕੋਡ ਇਸ ਨੂੰ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਚਾਹੀਦਾ ਹੈ।"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ “%s“ ਲਈ ਸਿਮ PIN ਕੋਡ ਇਸ ਨੂੰ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਚਾਹੀਦਾ ਹੈ।"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN ਕੋਡ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "ਪਿੰਨ ਕੋਡ ਵੇਖੋ"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "ਸਿਮ PUK ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "ਸਿਮ PUK ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
 "used."
-msgstr ""
-"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ “%s“ ਲਈ ਸਿਮ PUK ਕੋਡ ਇਸ ਨੂੰ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਚਾਹੀਦਾ ਹੈ।"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ “%s“ ਲਈ ਸਿਮ PUK ਕੋਡ ਇਸ ਨੂੰ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਚਾਹੀਦਾ ਹੈ।"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK ਕੋਡ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "ਨਵਾਂ ਪਿੰਨ ਕੋਡ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "ਨਵਾਂ ਪਿੰਨ ਕੋਡ ਫੇਰ ਦਿਓ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ਕੋਡ ਵੇਖੋ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ਕਨੈਕਸ਼ਨ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
-"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਇੱਕ IP ਐਡਰੈੱਸ ਸ਼ਾਮਲ ਕਰਨ"
-" ਲਈ “ਸ਼ਾਮਲ“ "
-"ਕਲਿੱਕ ਕਰੋ।"
-
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਇੱਕ IP ਐਡਰੈੱਸ ਸ਼ਾਮਲ ਕਰਨ ਲਈ “ਸ਼ਾਮਲ“ ਕਲਿੱਕ "
+"ਕਰੋ।"
+
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "ਜੋੜੋ(_A)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "ਹਟਾਓ(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ਆਟੋਮੈਟਿਕ ਲਏ ਰੂਟ ਅਣਡਿੱਠੇ ਕਰੋ(_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "ਕੇਵਲ ਇਹ ਕਨੈਕਸ਼ਨ ਨੂੰ ਇਸ ਦੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੀ ਸਰੋਤਾਂ ਲਈ ਵਰਤੋਂ(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਇਹ ਕਨੈਕਸ਼ਨ ਨੂੰ ਕਦੇ ਵੀ ਡਿਫਾਲਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਵਜੋਂ"
-" ਨਹੀਂ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਇਹ ਕਨੈਕਸ਼ਨ ਨੂੰ ਕਦੇ ਵੀ ਡਿਫਾਲਟ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਵਜੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "ਬਣਾਓ(_r)…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "ਕਨੈਕਸ਼ਨ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1143,651 +1160,826 @@ msgid ""
 msgstr ""
 "ਕਨੈਕਸ਼ਨ ਦੀ ਕਿਸਮ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "\n"
-"ਜੇ ਤੁਸੀਂ VPN ਕਨੈਕਸ਼ਨ ਬਣਾ ਰਹੇ ਹੋ ਅਤੇ ਉਹ VPN ਕਨੈਕਸ਼ਨ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ"
-" ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਕੋਲ "
+"ਜੇ ਤੁਸੀਂ VPN ਕਨੈਕਸ਼ਨ ਬਣਾ ਰਹੇ ਹੋ ਅਤੇ ਉਹ VPN ਕਨੈਕਸ਼ਨ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਕੋਲ "
 "ਢੁੱਕਵੀਂ VPN ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਨਾ ਹੋਵੇ।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "ਜੰਤਰ(_D):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "ਰਾਊਂਡ ਰਾਬਿਨ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "ਐਕਟਿਵ ਬੈਕਅੱਪ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ਬਰਾਡਕਾਸਟ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "ਅਡੈਪਟਿਵ ਟਰਾਂਸਮਿਟ ਲੋਡ ਸੰਤੁਲਨ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "ਅਡੈਪਟਿਵ ਲੋਡ ਸੰਤੁਲਨ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (ਸਿਫਾਰਸ਼ੀ)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "ਬਾਊਂਡ ਕੀਤੇ ਕਨੈਕਸ਼ਨ(_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "ਮੋਡ(_o):"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "ਨਿਗਰਾਨੀ ਫਰੀਕਿਊਂਸੀ(_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ਇੰਟਰਫੇਸ ਨਾਂ(_i):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "ਲਿੰਕ ਨਿਗਰਾਨੀ(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP ਟਾਰਗੇਟ(_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
-"ਜਦੋਂ ਲਿੰਕ ਦੀ ਸਥਿਤੀ ਪਤਾ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਵੇਖਣ ਲਈ IP ਐਡਰੈਸ ਜਾਂ ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੀ"
-" IP ਐਡਰੈਸ "
+"ਜਦੋਂ ਲਿੰਕ ਦੀ ਸਥਿਤੀ ਪਤਾ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਵੇਖਣ ਲਈ IP ਐਡਰੈਸ ਜਾਂ ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੀ IP ਐਡਰੈਸ "
 "ਦੀ ਸੂਚੀ।"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "ਲਿੰਕ ਅੱਪ ਦੇਰੀ(_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "ਲਿੰਕ ਡਾਊਨਲੋਡ ਦੇਰੀ(_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "ਪ੍ਰਾਇਮਰੀ(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "ਬਾਈਟ"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "ਪਾਥ ਕੀਮਤ(_c):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "ਤਰਜੀਹ(_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "ਹੇਅਰਪਿੰਨ ਮੋਡ(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "ਬਰਿਜ਼ ਕੀਤੇ ਕਨੈਕਸ਼ਨ(_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "ਫਾਰਵਰਡ ਦੇਰੀ(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "ਹੈਲੋ ਸਮਾਂ(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "I_GMP ਸਨੂਪਿੰਗ ਸਮਰੱਥ ਕਰੋ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP (ਸਪੈਨਿੰਗ ਟਰੀ ਪਰੋਟੋਕਾਲ) ਚਾਲੂ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "ਵੱਧੋ-ਵੱਧ ਉਮਰ(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "ਉਮਰ ਸਮਾਂ(_A):"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "ਨਾ-ਦੱਸੀ ਗਲਤੀ"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "ਪੱਕਾ"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "ਰਲਵਾਂ"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "ਸਥਿਰ"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
-"ਇੱਥੇ ਦਿੱਤਾ ਮੈਕ (MAC) ਐਡਰੈੱਸ ਨੈੱਟਵਰਕ ਜੰਤਰ ਲਈ ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ ਵਜੋਂ ਵਰਤਿਆ"
-" ਜਾਵੇਗਾ, ਜਿਸ ਲਈ ਇਸ "
-"ਕਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਫੀਚਰ ਨੂੰ ਮੈਕ ਕਲੋਨਿੰਗ ਜਾਂ ਸਪੂਫਿੰਗ ਕਹਿੰਦੇ ਹਨ।"
-" ਜਿਵੇਂ: "
+"ਇੱਥੇ ਦਿੱਤਾ ਮੈਕ (MAC) ਐਡਰੈੱਸ ਨੈੱਟਵਰਕ ਜੰਤਰ ਲਈ ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ ਵਜੋਂ ਵਰਤਿਆ ਜਾਵੇਗਾ, ਜਿਸ ਲਈ ਇਸ "
+"ਕਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਫੀਚਰ ਨੂੰ ਮੈਕ ਕਲੋਨਿੰਗ ਜਾਂ ਸਪੂਫਿੰਗ ਕਹਿੰਦੇ ਹਨ। ਜਿਵੇਂ: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC ਐਡਰੈਸ"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "HW ਐਡਰੈਸ"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "ਨਾ-ਢੁੱਕਵਾਂ %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "ਗਲਤ ਇੰਟਰਫੇਸ-ਨਾਂ (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "ਗਲਤ ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "ਨਾ-ਢੁੱਕਵਾਂ %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "ਜੰਤਰ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "ਨਾ-ਢੁੱਕਵਾਂ %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਕਰਕੇ ਕਨੈਕਸ਼ਨ ਸੀਕਰਟ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਲਈ ਡਾਟਾ ਸੈਂਟਰ ਬਰਿੱਜ਼ਿੰਗ (DCB) ਵਰਤੋਂ(_U)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "ਫਲੋ ਕੰਟਰੋਲ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "ਫੀਚਰ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "ਯੋਗ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "ਇਸ਼ਤਿਹਾਰ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "ਵਿਲਿੰਗ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "ਤਰਜੀਹ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "…ਚੋਣਾਂ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "ਤਰਜੀਹ ਗਰੁੱਪ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "ਫਬਰਿਕ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "ਤਰਜੀਹੀ ਫਲੋ ਕੰਟਰੋਲ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਲਈ ਤਰਜੀਹ ਵਿਰਾਮ ਟਰਾਂਸਮਿਸ਼ਨ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "ਤਰਜੀਹ:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "ਟਰੈਫਿਕ ਕੰਟਰੋਲ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "ਸਖਤ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "ਤਰਜੀਹੀ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "ਗਰੁੱਪ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ਗਰੁੱਪ ਆਈਡੀ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਲਈ ਤਰਜੀਹ ਗਰੁੱਪ ਆਈਡੀ ਦਿਉ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
-"ਹਰੇਕ ਗਰੁੱਪ ਵਲੋਂ ਵਰਤੋਂ ਲਈ ਮਨਜ਼ੂਰ ਬੈਂਡਵਿਡਥ ਫੀਸਦੀ ਦਿਉ। ਸਭ ਗਰੁੱਪਾਂ ਲਈ ਜੋੜ ਕੁੱਲ 100"
-"% ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+"ਹਰੇਕ ਗਰੁੱਪ ਵਲੋਂ ਵਰਤੋਂ ਲਈ ਮਨਜ਼ੂਰ ਬੈਂਡਵਿਡਥ ਫੀਸਦੀ ਦਿਉ। ਸਭ ਗਰੁੱਪਾਂ ਲਈ ਜੋੜ ਕੁੱਲ 100% ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
-msgstr ""
-"ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਵਲੋਂ ਵਰਤੀ ਜਾਣ ਵਾਲੀ ਤਰਜੀਹ ਗਰੁੱਪ ਬੈਂਡਵਿਡਥ ਦੀ ਫੀਸਦੀ ਦਿਉ।"
+msgstr "ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਵਲੋਂ ਵਰਤੀ ਜਾਣ ਵਾਲੀ ਤਰਜੀਹ ਗਰੁੱਪ ਬੈਂਡਵਿਡਥ ਦੀ ਫੀਸਦੀ ਦਿਉ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਲਈ ਸਖਤ ਬੈਂਡਵਿਡਥ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਤਰਜੀਹ ਲਈ ਟਰੈਫਿਕ ਕਲਾਸ ਦਿਉ।"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ਵਰਤੋਂਕਾਰ ਨਾਂ(_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "ਸਰਵਿਸ(_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ਇੰਟਰਫੇਸ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ਮੂਲ ਇੰਟਰਫੇਸ(_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ਮੂਲ ਇੰਟਰਫੇਸ(_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "ਟਵਿੱਸਟ ਪੇਅਰ (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "ਅਟੈਚਮੈਂਟ ਯੂਨਿਟ ਇੰਟਰਫੇਸ (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "ਮੀਡਿਆ ਇੰਡੀਮੈਂਡੈਂਟ ਇੰਟਰਫੇਸ (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "ਅੱਧਾ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "ਪੂਰਾ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "ਦਸਤੀ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "ਪੋਰਟ(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
-msgstr "ਜੰਤਰ(_D):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "ਕਨੋਲ ਕੀਤਾ MAC ਐਡਰੈੱਸ(_l):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "ਵੇਕ ਆਨ ਲਾਨ(LAN):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "ਡਿਫਾਲਟ(_f)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "ਅਣਡਿੱਠਾ(_I)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "ਭੌਤਿਕ(_P)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "ਯੂਨੀਕਾਸਟ(_U)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "ਮਲਟੀਕਾਸਟ(_t)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "ਬਰਾਡਕਾਸਟ(_B)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "ਮੈਜਿਕ(_g)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "ਵੇਕ ਆਨ ਲਾਨ(LAN) ਪਾਸਵਰਡ(_W):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ਸਪੀਡ(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+#, fuzzy
+msgid "Duple_x"
 msgstr "ਡੁਪਲੈਕਸ(_x):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "ਜਦੋਂ ਇਹ ਕਨੈਕਸ਼ਨ ਵਰਤਿਆ ਜਾਵੇ ਤਾਂ ਆਪਣੇ-ਆਪ ਹੀ _VPN ਨੂੰ ਕਨੈਕਟ ਕਰੋ"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "ਹਾਂ"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "ਨਹੀਂ"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "ਸਭ ਵਰਤੋਂਕਾਰ ਇਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੇ ਹਨ(_u)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "ਜਦੋਂ ਵੀ ਉਪਲੱਬਧ ਹੋਵੇ ਤਾਂ ਇਹ ਨੈੱਟਵਰਕ ਨਾਲ ਆਪਣੇ-ਆਪ ਹੀ ਕਨੈਕਟ ਕਰੋ(_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "ਜਦੋਂ ਇਹ ਕਨੈਕਸ਼ਨ ਵਰਤਿਆ ਜਾਵੇ ਤਾਂ ਆਪਣੇ-ਆਪ ਹੀ _VPN ਨੂੰ ਕਨੈਕਟ ਕਰੋ"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "ਫਾਇਰਵਾਲ ਜ਼ੋਨ(_z):"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "ਟੀਮ ਕੀਤੇ ਕਨੈਕਸ਼ਨ(_T):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
-msgstr "ਆਟੋ-ਸਰਗਰਮ ਲਈ ਕਨੈਕਸ਼ਨ ਤਰਜੀਹ(_p):"
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਕਰੋ(_a)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "ਫਾਇਰਵਾਲ ਜ਼ੋਨ(_z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
-"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਆਪਣੇ-ਆਪ ਐਡਰੈਸ ਦੇ ਨਾਲ ਨਾਲ "
-"ਸਥਿਰ IP ਐਡਰੈਸ ਜੋੜਨ ਲਈ “ਸ਼ਾਮਲ“ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
+"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਆਪਣੇ-ਆਪ ਐਡਰੈਸ ਦੇ ਨਾਲ ਨਾਲ ਸਥਿਰ IP ਐਡਰੈਸ "
+"ਜੋੜਨ ਲਈ “ਸ਼ਾਮਲ“ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1795,1503 +1987,1567 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "ਵਾਧੂ ਸਥਿਰ ਐਡਰੈਸ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "ਐਡਰੈਸ (ਚੋਣਵਾਂ)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "ਡਾਟਾਗਰਾਮ"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "ਕਨੈਕਟ ਹੈ"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
 msgstr "ਟਰਾਂਸਪੋਰਟ ਮੋਡ(_T):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
 msgstr "ਜੰਤਰ ਨਾਂ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
 msgstr "ਮੁੱਢਲਾ ਜੰਤਰ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
-#| msgid "M_ode:"
-msgid "Mode:"
-msgstr "ਮੋਡ:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+#, fuzzy
+msgid "Mode"
+msgstr "ਮੋਡ(_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+#, fuzzy
+msgid "Local IP"
 msgstr "ਲੋਕਲ IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+#, fuzzy
+msgid "Remote IP"
 msgstr "ਰਿਮੋਟ IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+#, fuzzy
+msgid "Input key"
 msgstr "ਇਨਪੁੱਟ ਕੁੰਜੀ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+#, fuzzy
+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-ip-tunnel.ui:245
+#, fuzzy
+msgid "MTU"
+msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "ਦਸਤੀ DNS ਸੈਟਿੰਗ ਨਾਲ ਆਟੋਮੈਟਿਕ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ਲਿੰਕ-ਲੋਕਲ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਸਾਂਝਾ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "ਢੰਗ(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
-"DHCP ਕਲਾਈਂਟ ਪਛਾਣ ਕਰਤਾ ਨੈੱਟਵਰਕ ਪਰਸ਼ਾਸ਼ਕ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਕਸਟਮਾਈਜ਼"
-" ਕਰਨ ਲਈ "
+"DHCP ਕਲਾਈਂਟ ਪਛਾਣ ਕਰਤਾ ਨੈੱਟਵਰਕ ਪਰਸ਼ਾਸ਼ਕ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਕਸਟਮਾਈਜ਼ ਕਰਨ ਲਈ "
 "ਸਹਾਇਕ ਹੈ। ਜੇ ਤੁਸੀਂ DHCP ਕਲਾਇਟ ਪਛਾਣਕਰਤਾ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇੱਥੇ ਦਿਓ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr ""
-"ਜਦੋਂ ਹੋਸਟ-ਨਾਂ ਲੱਭਣੇ ਹੋਣ ਤੋਂ ਡੋਮੇਨ ਵਰਤੋਂ। ਵੱਖ ਵੱਖ ਡੋਮੇਨ ਦੇਣ ਲਈ ਕੌਮੇ (,) ਵਰਤੋਂ।"
+msgstr "ਜਦੋਂ ਹੋਸਟ-ਨਾਂ ਲੱਭਣੇ ਹੋਣ ਤੋਂ ਡੋਮੇਨ ਵਰਤੋਂ। ਵੱਖ ਵੱਖ ਡੋਮੇਨ ਦੇਣ ਲਈ ਕੌਮੇ (,) ਵਰਤੋਂ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP ਕਲਾਇਟ ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "ਖੋਜ ਡੋਮੇਨ(_e):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS ਸਰਵਰ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
-"ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਹੋਸਟ-ਨਾਂ ਲੈਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। ਕਈ ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ"
-" ਐਡਰੈਸਾਂ ਲਈ "
+"ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਹੋਸਟ-ਨਾਂ ਲੈਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। ਕਈ ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਐਡਰੈਸਾਂ ਲਈ "
 "ਕੌਮਿਆਂ (,) ਦੀ ਵਰਤੋਂ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਦੇ ਮੁਕੰਮਲ ਹੋਣ ਲਈ IPv_4 ਐਡਰੈੱਸਿੰਗ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"ਜਦੋਂ IPv6-ਅਧਾਰਿਤ ਨੈੱਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾਂਦਾ ਹੈ, ਕਨੈਕਸ਼ਨ ਮੁਕੰਮਲ ਹੋਣ ਲਈ ਮਨਜ਼ੂਰੀ"
-" ਦਿੰਦਾ ਹੈ, ਜੇ IPv4 "
+"ਜਦੋਂ IPv6-ਅਧਾਰਿਤ ਨੈੱਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾਂਦਾ ਹੈ, ਕਨੈਕਸ਼ਨ ਮੁਕੰਮਲ ਹੋਣ ਲਈ ਮਨਜ਼ੂਰੀ ਦਿੰਦਾ ਹੈ, ਜੇ IPv4 "
 "ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੁੰਦੀ ਹੈ, ਪਰ IPv6 ਸੰਰਚਨਾ ਸਫ਼ਲ ਹੁੰਦੀ ਹੈ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "…ਰੂਟ(_R)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "ਬੰਦ ਹੈ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "ਚਾਲੂ (ਤਰਜੀਹੀ ਜਨਤਕ ਐਡਰੈਸ)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "ਚਾਲੂ (ਤਰਜੀਹੀ ਆਰਜ਼ੀ ਐਡਰੈਸ)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "ਸਥਿਰ"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
-"ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਹੋਸਟ-ਨਾਂ ਲੈਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। ਕਈ ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ"
-" ਐਡਰੈਸਾਂ ਲਈ "
-"ਕੌਮਿਆਂ (,) ਦੀ ਵਰਤੋਂ ਕਰੋ। ਲਿੰਕ-ਲੋਕਲ ਸਿਰਨਾਵਿਆਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਵਾਲੇ ਇੰਟਰਫੇਸ ਲਈ"
-" ਆਟੋਮੈਟਿਖ ਸਕੋਪ ਲਈ "
+"ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ ਹੋਸਟ-ਨਾਂ ਲੈਣ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ। ਕਈ ਡੋਮੇਨ ਨੇਮ ਸਰਵਰ ਐਡਰੈਸਾਂ ਲਈ "
+"ਕੌਮਿਆਂ (,) ਦੀ ਵਰਤੋਂ ਕਰੋ। ਲਿੰਕ-ਲੋਕਲ ਸਿਰਨਾਵਿਆਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਵਾਲੇ ਇੰਟਰਫੇਸ ਲਈ ਆਟੋਮੈਟਿਖ ਸਕੋਪ ਲਈ "
 "ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "I_Pv6 ਪਰਦੇਦਾਰੀ ਇਕਸਟੈਨਸ਼ਨ:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਦੇ ਮੁਕੰਮਲ ਹੋਣ ਲਈ IPv_6 ਐਡਰੈੱਸਿੰਗ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"ਜਦੋਂ IPv4-ਅਧਾਰਿਤ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਕਨੈਕਸ਼ਨ ਮੁਕੰਮਲ ਹੋਣ ਲਈ"
-" ਮਨਜ਼ੂਰੀ ਦਿੰਦਾ ਹੈ, ਜੇ "
+"ਜਦੋਂ IPv4-ਅਧਾਰਿਤ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਕਨੈਕਸ਼ਨ ਮੁਕੰਮਲ ਹੋਣ ਲਈ ਮਨਜ਼ੂਰੀ ਦਿੰਦਾ ਹੈ, ਜੇ "
 "IPv6 ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੁੰਦੀ ਹੈ, ਪਰ IPv4 ਸੰਰਚਨਾ ਸਫ਼ਲ ਹੁੰਦੀ ਹੈ।"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "ਚੈਕ ਕਰੋ"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
-#| msgid "Metric"
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "ਸਖ਼ਤ"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#: src/connection-editor/ce-page-macsec.ui:154
+#, fuzzy
+msgid "CKN"
 msgstr "CKN:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#: src/connection-editor/ce-page-macsec.ui:167
+#, fuzzy
+msgid "CAK"
 msgstr "CAK:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#: src/connection-editor/ce-page-macsec.ui:191
+#, fuzzy
+msgid "Keys"
 msgstr "ਕੁੰਜੀਆਂ:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#: src/connection-editor/ce-page-macsec.ui:207
+#, fuzzy
+msgid "Parameters"
 msgstr "ਪੈਰਾਮੀਟਰ:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#: src/connection-editor/ce-page-macsec.ui:224
+#, fuzzy
+msgid "Validation"
 msgstr "ਵੈਧਤਾ:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-#| msgid "_Import"
-msgid "SCI port:"
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
 msgstr "SCI ਪੋਰਟ:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "ਮੁੱਢਲਾ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "ਨੰਬਰ(_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ਨੈੱਟਵਰਕ ID(_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "…ਬਦਲੋ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "ਜੇ ਘਰ (ਹੋਮ) ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਨਾ ਹੋਵੇ ਤਾਂ ਰੋਮਿੰਗ ਮਨਜ਼ੂਰ(_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "ਮਨਜ਼ੂਰ ਢੰਗ:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "ਸੰਰਚਨਾ ਢੰਗ(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "ਕੰਪਰੈੱਸ਼ਨ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ਪੁਆਇੰਟ-ਟੂ-ਪੁਆਇੰਟ ਇੰਕ੍ਰਿਪਸ਼ਨ ਵਰਤੋਂ (MPPE)(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "੧੨੮-ਬਿੱਟ ਇੰਕ੍ਰਿਪਸ਼ਨ ਲੋੜੀਦੀ ਹੈ(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ਸਟੇਟਫੁੱਲ MPPE ਵਰਤੋਂ(_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD ਡਾਟਾ ਕੰਪਰੈਸ਼ਨ ਮਨਜ਼ੂਰ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "ਡਿਫਲੇਸ਼ਨ ਡਾਟਾ ਕੰਪਰੈਸ਼ਨ ਮਨਜ਼ੂਰ(_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP ਹੈੱਡਰ ਕੰਪਰੈੱਸ਼ਨ ਵਰਤੋਂ(_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "ਈਚੋ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP ਈਚੋ ਪੈਕੇਟ ਭੇਜੋ(_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "ਕੇਵਲ ਬਰਾਊਜ਼ਰ ਲਈ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+#, fuzzy
+msgid "PAC URL"
 msgstr "PAC URL:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:64
+#, fuzzy
+msgid "PAC script"
 msgstr "PAC ਸਕ੍ਰਿਪਟ:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "…ਫਾਇਲ ਤੋਂ ਸਕ੍ਰਿਪਟ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
 msgstr "ਢੰਗ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "ਤਕਨੀਕੀ(_v)…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "ਮਾਸਟਰ ਵਜੋਂ ਸੈੱਟ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "ਈਥਰਨੈੱਟ ਪੋਰਟ ਹਾਲਤ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "ਟੀਮ ਤਕਨੀਕੀ ਚੋਣਾਂ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+#, fuzzy
+msgid "_Queue ID"
 msgstr "ਕਤਾਰ ID(_Q):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "_Port priority:"
+#: src/connection-editor/ce-page-team-port.ui:271
+#, fuzzy
+msgid "_Port priority"
 msgstr "ਪੋਰਟ ਤਰਜੀਹ(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "ਪੋਰਟ ਸਟਿੱਕੀ(_s)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP ਰਨਰ ਚੋਣਾਂ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
 msgstr "_LACP ਪੋਰਟ ਤਰਜੀਹ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+msgid "LACP port _key"
 msgstr "LACP ਪੋਰਟ ਕੁੰਜੀ(_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 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:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+#, fuzzy
+msgid "_Up delay"
 msgstr "ਅੱਪ ਦੇਰੀ(_U):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+#, fuzzy
+msgid "_Down delay"
 msgstr "ਬੰਦ ਹੋਣ ਦੇਰੀ(_D):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+#, fuzzy
+msgid "Send _interval"
 msgstr "ਭੇਜਣ ਅੰਤਰਾਲ(_i):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
 msgstr "ਸਰੋਤ ਹੋਸਟ(_S):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+#, fuzzy
+msgid "_Target host"
 msgstr "ਟਾਰਗੇਟ ਹੋਸਟ(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "ਨਾ-ਸਰਗਰਮ ਪੋਰਟ 'ਤੇ ਭੇਜੋ(_e)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "…ਫਾਇਲ ਤੋਂ ਟੀਮ ਸੰਰਚਨਾ ਇੰਪੋਰਟ ਕਰੋ(_p)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
 msgstr "_JSON ਸੰਰਚਨਾ ਸੋਧੋ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "ਰਾਅ ਸੰਰਚਨਾ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ ਤਰਜੀਹ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "ਸਭ ਤੋਂ ਵੱਧ ਤਰਜੀਹ (ਸਥਿਰ)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "ਬੈਂਡਵਿਡਥ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "ਪੋਰਟਾਂ ਦੀ ਸਭ ਤੋਂ ਵੱਧ ਗਿਣਤੀ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "ਪੋਰਟ ਤਰਜੀਹ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "ਟੀਮ ਜੰਤਰ ਤੋਂ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "ਸਰਗਰਮ ਪੋਰਟ ਤੋਂ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "ਸਰਗਰਮ ਤੋਂ ਟੀਮ ਜੰਤਰ ਤੋਂ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "ਟੀਮ ਕੀਤੇ ਕਨੈਕਸ਼ਨ(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "ਲੋਡ ਬਲੈਨਸ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ਈਥਰਨੈੱਟ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "ਕੋਈ L3 ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "ਕੋਈ L4 ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ(_H):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+#, fuzzy
+msgid "_Runner"
 msgstr "ਰਨਰ(_R):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
 msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ ਨੀਤੀ(_H):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "ਰਨਰ ਦਾ ਨਾਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+#, fuzzy
+msgid "_System priority"
 msgstr "ਸਿਸਟਮ ਤਰਜੀਹ(_S):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+#, fuzzy
+msgid "_Minimum ports"
 msgstr "ਘੱਟੋ-ਘੱਟ ਪੋਰਟ(_M):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "ਸਿਸਟਮ ਤਰਜੀਹ, ਮੁੱਲ 0 - 65535 ਹੈ।"
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "ਟਰਾਂਸਮਿਸ਼ਨ ਹੈਸ਼ ਲਈ ਖੇਤਰ(_F)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
 msgstr "ਟਰਾਂਸਮਿਸ਼ਨ ਬਲੈਂਸ ਕਰਨ ਦਾ ਇੰਟਰਫੇਸ(_b):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
 msgstr "ਟਰਾਂਸਮਿਸ਼ਨ ਬਲੈਂਸਰ(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "ਰਨਰ"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "ਮੂਲ ਇੰਟਰਫੇਸ(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "VLAN ਇੰਟਰਫੇਸ ਨਾਂ(_f):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "ਕਨੋਲ ਕੀਤਾ M_AC ਐਡਰੈੱਸ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "ਫਲੈਗ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ਜੰਤਰ ਨਾਂ + ਨੰਬਰ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + ਨੰਬਰ"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "ਸੁਰੱਖਿਆ(_e):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "ਕਲਾਈਂਟ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "ਹਾਟਸਪਾਟ"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "ਐਡ-ਹਾਕ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ਟਰਾਂਸਮਿਸ਼ਨ ਪਾਵਰ(_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "ਰੇਟ(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ਚੈਨਲ(_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ਬੈਂਡ(_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਕੋਈ ਪਾਲਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਨਹੀਂ ਹੈ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "ਮਨਜ਼ੂਰ ਕੀਤੇ ਪਰਮਾਣਕਿਤਾ ਢੰਗ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "ਐਕਸਟੇਸ਼ੇਬਲ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "ਪਾਸਵਰਡ ਪਰਮਾਣਕਿਤਾ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "ਮਾਈਕਰੋਸਾਫ਼ਟ ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "ਮਾਈਕਰੋਸਾਫ਼ਟ ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ ਵਰਜਨ ੨"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
-"ਬਹੁਤੇ ਹਾਲਤਾਂ ਵਿੱਚ ਪਰੋਵਾਇਡਰ ਦਾ PPP ਸਰਵਰ ਸਭ ਪਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਲਈ ਸਹਾਇਕ ਹੋਵੇਗਾ। ਜੇ"
-" ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ "
-"ਹੋਵੇ ਤਾਂ ਕੁਝ ਢੰਗ ਅਸਮਰੱਥ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
+"ਬਹੁਤੇ ਹਾਲਤਾਂ ਵਿੱਚ ਪਰੋਵਾਇਡਰ ਦਾ PPP ਸਰਵਰ ਸਭ ਪਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਲਈ ਸਹਾਇਕ ਹੋਵੇਗਾ। ਜੇ ਕਨੈਕਸ਼ਨ "
+"ਫੇਲ੍ਹ ਹੋਵੇ ਤਾਂ ਕੁਝ ਢੰਗ ਅਸਮਰੱਥ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ਇੰਫੀਬੈਂਡ"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "ਬੌਂਡ"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "ਟੀਮ"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "ਬਰਿੱਜ਼"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP ਟਨਲ"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN ਪਲੱਗਇਨ VPN ਕਨੈਕਸ਼ਨ ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।\n"
-"\n"
-"ਗਲਤੀ: ਕੋਈ VPN ਸਰਵਿਸ ਟਾਈਪ ਨਹੀਂ।"
 
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "VPN ਕਨੈਕਸ਼ਨ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
-
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ਫਾਇਲ ”%s” ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ ਜਾਂ ਪਛਾਣਯੋਗ VPN ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ।\n"
+"VPN ਪਲੱਗਇਨ VPN ਕਨੈਕਸ਼ਨ ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।\n"
 "\n"
-"ਗਲਤੀ: %s।"
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
+"ਗਲਤੀ: ਕੋਈ VPN ਸਰਵਿਸ ਟਾਈਪ ਨਹੀਂ।"
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "ਹਾਰਡਵੇਅਰ"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "ਵਰਚੁਅਲ"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "…ਸੰਭਾਲੀ VPN ਸੰਰਚਨਾ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ਅਣਜਾਣ ਗਲਤੀ ਕਰਕੇ ਕਨੈਕਸ਼ਨ ਐਡੀਟਰ ਡਾਈਲਾਗ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "ਨਵਾਂ ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "ਕਨੈਕਸ਼ਨ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕਨੈਕਸ਼ਨ %s ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN ਕਨੈਕਸ਼ਨ"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "ਨੈੱਟਮਾਸਕ"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "ਗੇਟਵੇ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "ਮੈਟਰਿਕ"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ਪ੍ਰੀਫਿਕਸ"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%s ਸੋਧ"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "ਬੇਨਾਮ ਕਨੈਕਸ਼ਨ ਸੋਧ"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "ਕਨੈਕਸ਼ਨ ਨਾਂ ਗੁੰਮ ਹੈ"
 
-#: ../src/connection-editor/nm-connection-editor.c:353
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "ਐਡੀਟਰ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"
 
-#: ../src/connection-editor/nm-connection-editor.c:360
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "ਕਨੈਕਸ਼ਨ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../src/connection-editor/nm-connection-editor.c:375
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "ਅਢੁੱਕਵੀਂ ਸੈਟਿੰਗ %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:451
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "ਕਨੈਕਸ਼ਨ ਐਡੀਟਰ ਕੁਝ ਲੋੜੀਦੇ ਸਰੋਤ ਨਹੀਂ ਲੱਭ ਸਕਿਆ (.ui ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ ਹੈ)।"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਲਈ ਕੀਤੇ ਬਦਲਾਅ ਸੰਭਾਲੋ"
 
-#: ../src/connection-editor/nm-connection-editor.c:580
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਲਈ ਪਰਮਾਣਕਿਤਾ ਨੂੰ ਇਸ ਮਸ਼ੀਨ ਉੱਤੇ ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਸੰਭਾਲੋ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:596
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:598
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "ਕਨੈਕਸ਼ਨ ਐਡੀਟਰ ਡਾਈਲਾਗ ਬਣਾਉਣ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:739
+#: src/connection-editor/nm-connection-editor.c:742
 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:759
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "ਐਡੀਟਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-editor.c:1159
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "ਕਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "ਠੀਕ ਕਰੋ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
-msgstr ""
-"ਸੁਰੱਖਿਆ ਲੇਬਲ ਕੁਝ ਫਾਇਲਾਂ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਵਰਤੇ ਜਾਣ ਤੋਂ ਰੋਕਦੇ ਹਨ।"
+msgstr "ਸੁਰੱਖਿਆ ਲੇਬਲ ਕੁਝ ਫਾਇਲਾਂ ਨੂੰ ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਮਾਣਕਿਤਾ ਨਾਲ ਵਰਤੇ ਜਾਣ ਤੋਂ ਰੋਕਦੇ ਹਨ।"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "ਕਨੈਕਸ਼ਨ ਨਾਂ(_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "…ਐਕਸਪੋਰਟ(_E)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "ਫਾਇਲ ਮੁੜ-ਲੇਬਲ ਕਰੋ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "ਮੁੜ ਲੇਬਲ ਲਾਓ(_R)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "ਮੁੜ ਲੇਬਲ ਲਾਓ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "ਫਾਇਲ-ਨਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ਹੁਣ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ਸਾਲ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "ਕਨੈਕਸ਼ਨ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
-#: ../src/connection-editor/nm-connection-list.c:448
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "ਸੋਧਣ ਲਈ ਕਨੈਕਸ਼ਨ ਚੁਣੋ"
 
-#: ../src/connection-editor/nm-connection-list.c:450
-#| msgid "Team connection %d"
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "ਹਟਾਉਣ ਲਈ ਕਨੈਕਸ਼ਨ ਚੁਣੋ"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ਆਖਰੀ ਵਰਤੇ"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "ਚੁਣਿਆ ਕਨੈਕਸ਼ਨ ਸੋਧੋ"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ਚੁਣੇ ਕਨੈਕਸ਼ਨ ਨੂੰ ਸੋਧਣ ਲੀ ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "ਚੁਣਿਆ ਕਨੈਕਸ਼ਨ ਹਟਾਓ"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ਚੁਣੇ ਕਨੈਕਸ਼ਨ ਨੂੰ ਹਟਾਉਣ ਲਈ ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ਅਣ-ਸਹਾਇਕ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਕਿਸਮ"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "ਪਤਾ ਨਹੀਂ ਹੈ ਕਿ ”%s” ਕਨੈਕਸ਼ਨ ਕਿਵੇਂ ਬਣਾਇਆ ਜਾਵੇ"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "ਕਨੈਕਸ਼ਨ ਸੋਧਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "ਕਨੈਕਸ਼ਨ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "ਕੋਈ VPN ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "ਪਤਾ ਨਹੀਂ ਹੈ ਕਿ ”%s” ਕਨੈਕਸ਼ਨ ਕਿਵੇਂ ਬਣਾਇਆ ਜਾਵੇ"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "ਕਨੈਕਸ਼ਨ ਸੋਧਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID ”%s” ਨਾਲ ਕੋਈ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "ਨਵਾਂ ਕਨੈਕਸ਼ਨ ਜੋੜੋ"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X ਸੁਰੱਖਿਆ"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X ਸੁਰੱਖਿਆ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "ਇਸ ਕਨੈਕਸ਼ਨ ਲਈ 802.1_X ਸੁਰੱਖਿਆ ਵਰਤੋਂ"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "ਬਲੂਟੁੱਥ ਜੰਤਰ ਦੇ MAC ਐਡਰੈਸ ਹੈ। ਜਿਵੇਂ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "ਬਲੂਟੁੱਥ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ਗ਼ਲਤ ਬਲੂਟੁੱਥ ਜੰਤਰ (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "ਬਲੂਟੁੱਥ ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "ਬਲਿਊਟੁੱਥ ਕਿਸਮ"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "ਬਲੂਟੁੱਥ ਕਨੈਕਸ਼ਨ ਪਰੋਫਾਇਲ ਦੀ ਕਿਸਮ ਚੁਣੋ।"
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "ਨਿੱਜੀ ਖੇਤਰ ਨੈੱਟਵਰਕ(_P)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "ਡਾਇਲ ਅੱਪ ਨੈੱਟਵਰਕ(_D)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "ਬੌਂਡ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "ਪ੍ਰਾਇਮਰੀ"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "ਬੌਂਡ ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "ਬਰਿਜ਼ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ਬਰਿਜ਼ ਕਨੈਕਸ਼ਨ %d"
@@ -3299,380 +3555,368 @@ msgstr "ਬਰਿਜ਼ ਕਨੈਕਸ਼ਨ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "ਬਰਿਜ਼ ਪੋਰਟ"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "ਬਰਿਜ਼ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "DCB ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ਮੂਲ ਇੰਟਰਫੇਸ(_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
-"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ ਪੱਕੇ"
-" MAC ਜਾਂ "
-"ਦੋਵਾਂ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ “em1”, “3C:97:0E:42:1A:19”, “em1"
-" (3C:97:0E:42:1A:19)”"
+"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ ਪੱਕੇ MAC ਜਾਂ ਦੋਵਾਂ ਰਾਹੀਂ "
+"ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ “em1”, “3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ਅਣਡਿੱਠਾ ਕੀਤੀ"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ਈਥਰਨੈੱਟ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "ਈਥਰਨੈੱਟ ਜੰਤਰ"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "ਕਨੋਲ ਕੀਤਾ MAC"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "ਵੇਕ ਆਨ ਲਾਨ(LAN) ਪਾਸਵਰਡ"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ਈਥਰਨੈੱਟ ਕਨੈਕਸ਼ਨ %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
-"ਜ਼ੋਨ ਕਨੈਕਸ਼ਨ ਦਾ ਭਰੋਸਾ ਪੱਧਰ ਦਰਸਾਉਂਦਾ ਹੈ। ਡਿਫਾਲਟ ਨਿਯਮਤ ਜ਼ੋਨ ਨਹੀਂ ਹੈ, ਇਸ ਨੂੰ ਚੁਣਨ"
-" ਨਾਲ ਫਾਇਰਵਾਲ "
-"ਵਿੱਚ ਮੂਲ ਜ਼ੋਨ ਸੈੱਟ ਵਰਤੋਂ ਦਾ ਨਤੀਜਾ ਹੁੰਦਾ ਹੈ। ਤਾਂ ਹੀ ਪ੍ਰਭਾਵੀ ਹੈ ਜੇ firewalld"
-" ਸਰਗਰਮ ਹੈ।"
+"ਜ਼ੋਨ ਕਨੈਕਸ਼ਨ ਦਾ ਭਰੋਸਾ ਪੱਧਰ ਦਰਸਾਉਂਦਾ ਹੈ। ਡਿਫਾਲਟ ਨਿਯਮਤ ਜ਼ੋਨ ਨਹੀਂ ਹੈ, ਇਸ ਨੂੰ ਚੁਣਨ ਨਾਲ ਫਾਇਰਵਾਲ "
+"ਵਿੱਚ ਮੂਲ ਜ਼ੋਨ ਸੈੱਟ ਵਰਤੋਂ ਦਾ ਨਤੀਜਾ ਹੁੰਦਾ ਹੈ। ਤਾਂ ਹੀ ਪ੍ਰਭਾਵੀ ਹੈ ਜੇ firewalld ਸਰਗਰਮ ਹੈ।"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "ਆਮ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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)”"
 msgstr ""
-"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇਸ ਦੇ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ"
-" ਪੱਕੇ MAC ਜਾਂ "
-"ਦੋਵਾਂ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ: “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)”"
+"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇਸ ਦੇ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ ਪੱਕੇ MAC ਜਾਂ ਦੋਵਾਂ "
+"ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ: “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)”"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "ਇਫੀਂਬੈਂਡ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "ਇਫੀਂਬੈਂਡ ਜੰਤਰ"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ਇਫੀਂਬੈਂਡ ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "IP ਟਨਲ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP ਟਨਲ ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "ਆਟੋਮੈਟਿਕ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (VPN) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ, ਸਿਰਫ਼ ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "ਆਟੋਮੈਟਿਕ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (PPPoE) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "ਆਟੋਮੈਟਿਕ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (DHCP) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "ਲਿੰਕ-ਲੋਕਲ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "ਵਾਧੂ _DNS ਸਰਵਰ:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "ਵਾਧੂ ਖੋਜ ਡੋਮੇਨ(_e):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ਲਈ IPv4 ਰੂਟ ਸੋਧ"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 ਸੈਟਿੰਗਾਂ"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 ਐਡਰੈਸ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 ਐਡਰੈਸ ਨੈੱਟਮਾਸਕ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 ਗੇਟਵੇ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS ਸਰਵਰ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ਆਟੋਮੈਟਿਕ, ਸਿਰਫ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ਲਈ IPv6 ਰੂਟ ਸੋਧ"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 ਸੈਟਿੰਗਾਂ"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 ਐਡਰੈਸ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 ਪ੍ਰੀਫਿਕਸ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 ਗੇਟਵੇ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS ਸਰਵਰ “%s” ਅਢੁੱਕਵਾਂ ਹੈ"
 
-#: ../src/connection-editor/page-macsec.c:192
-#| msgid "Could not load WiMAX user interface."
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "MACsec ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
-#| msgid "WiMAX connection %d"
 msgid "MACSEC connection %d"
 msgstr "MACSEC ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "ਡੁਪਲੀਕੇਟ ਸਲੇਵ"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "ਸਲੇਵ “%s“ ਅਤੇ “%s“ ਦੋਵਾਂ ਨੂੰ ਜੰਤਰ “%s“ ਲਈ ਲਾਗੂ ਕਰੋ"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
-"ਸਲੇਵ “%s“ ਅਤੇ “%s“ ਇੱਕੋ ਭੌਤਿਕ ਜੰਤਰ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਵਰਚੁਅਲ ਪੋਰਟਾਂ (“%s“ ਤੇ “%s“)"
-" ਲਈ ਲਾਗੂ ਕਰੋ"
+"ਸਲੇਵ “%s“ ਅਤੇ “%s“ ਇੱਕੋ ਭੌਤਿਕ ਜੰਤਰ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਵਰਚੁਅਲ ਪੋਰਟਾਂ (“%s“ ਤੇ “%s“) ਲਈ ਲਾਗੂ ਕਰੋ"
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s ਸਲੇਵ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ਅਣ-ਸਹਾਇਕ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਕਿਸਮ"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
-"ਤਕਨਾਲੋਜੀ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਹਾਡਾ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਵਰਤਦਾ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਪੱਕਾ ਪਤਾ"
-" ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ "
+"ਤਕਨਾਲੋਜੀ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਹਾਡਾ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਵਰਤਦਾ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ "
 "ਪਰੋਵਾਇਡਰ ਤੋਂ ਪੁੱਛੋ।"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr ""
-"ਮੇਰਾ ਪਰੋਵਾਇਡਰ _GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ _GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ C_DMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ।"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s ਲਈ PPP ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਸੋਧ"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ਸੈਟਿੰਗ"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "ਪਰਾਕਸੀ"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "ਪਰਾਕਸੀ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "ਗਲਤੀ: ਫਾਇਲ ਵਿੱਚ ਠੀਕ JSON ਸੰਰਚਨਾ ਨਹੀਂ ਰੱਖਦਾ ਹੈ"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "ਟੀਮ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "ਟੀਮ ਕਨੈਕਸ਼ਨ %d"
@@ -3680,185 +3924,177 @@ msgstr "ਟੀਮ ਕਨੈਕਸ਼ਨ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "ਟੀਮ ਪੋਰਟ"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (“%s” ਰਾਹੀਂ)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "ਨਵਾਂ ਕਨੈਕਸ਼ਨ…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "ਵੀਲੈਨ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan ਪੇਰੈਂਟ"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "”%s” ਲਈ VPN ਪਲੱਗਇਨ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "“%s“ (%s) ਲਈ ਐਡੀਟਰ VPN ਪਲੱਗਇਨ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "ਅਣਪਛਾਤਾ ਅਸਫ਼ਲਤਾ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "”%s” ਲਈ VPN ਪਲੱਗਇਨ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
-"VPN ਦੀ ਕਿਸਮ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਨਵੇਂ ਕਨੈਕਸ਼ਨ ਲਈ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ। ਜੇ VPN ਕਨੈਕਸ਼ਨ "
-"ਦੀ ਟਾਈਪ ਲਿਸਟ ਵਿੱਚ ਨਾ ਦੱਸੇ, ਜੋ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਕੋਲ"
-" ਢੁੱਕਵੀਂ VPN ਪਲੱਗਇਨ "
-"ਇੰਸਟਾਲ ਨਾ ਹੋਵੇ।"
+"VPN ਦੀ ਕਿਸਮ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਨਵੇਂ ਕਨੈਕਸ਼ਨ ਲਈ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ। ਜੇ VPN ਕਨੈਕਸ਼ਨ ਦੀ ਟਾਈਪ ਲਿਸਟ ਵਿੱਚ "
+"ਨਾ ਦੱਸੇ, ਜੋ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਢੁੱਕਵੀਂ VPN ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਨਾ ਹੋਵੇ।"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
-"ਇਹ ਚੋਣ ਇਸ ਕਨੈਕਸ਼ਨ ਨੂੰ Wi-Fi ਐਕਸੈੱਸ ਪੁਆਇੰਟ (AP) ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਲਾਕ ਕਰਦੀ "
-"ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ BSSID ਵਲੋਂ ਦਿੱਤਾ ਹੈ। ਜਿਵੇਂ: 00:11:22:33:44:55"
+"ਇਹ ਚੋਣ ਇਸ ਕਨੈਕਸ਼ਨ ਨੂੰ Wi-Fi ਐਕਸੈੱਸ ਪੁਆਇੰਟ (AP) ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਲਾਕ ਕਰਦੀ ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ "
+"BSSID ਵਲੋਂ ਦਿੱਤਾ ਹੈ। ਜਿਵੇਂ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
-"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ ਪੱਕੇ"
-" MAC ਐਡਰੈੱਸ "
-"ਜਾਂ ਦੋਵਾਂ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ: “wlan0”, “3C:97:0E:42:1A:19”, "
-"“wlan0 (3C:97:0E:42:1A:19)”"
+"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਕਿ ਇੰਟਰਫੇਸ ਨਾਂ ਜਾਂ ਪੱਕੇ MAC ਐਡਰੈੱਸ ਜਾਂ ਦੋਵਾਂ "
+"ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। ਜਿਵੇਂ: “wlan0”, “3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi ਜੰਤਰ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi ਕਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-ਬਿੱਟ ਕੁੰਜੀ (Hex ਜਾਂ ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ਇੰਟਰਪ੍ਰਾਈਜ"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr ""
-"Wi-Fi ਸੁਰੱਖਿਆ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ; Wi-Fi ਸੈਟਿੰਗ ਗੁੰਮ ਹੈ।"
+msgstr "Wi-Fi ਸੁਰੱਖਿਆ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ; Wi-Fi ਸੈਟਿੰਗ ਗੁੰਮ ਹੈ।"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi ਸੁਰੱਖਿਆ"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi ਸੁਰੱਖਿਆ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "ਗੁੰਮ SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "ਐਡ-ਹਾਕ ਮੋਡ ਨਾਲ ਸੁਰੱਖਿਆ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "”%s” ਫਾਇਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ਬਦਲੋ(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ VPN, ਜੋ ਤੁਸੀਂ ਸੰਭਾਲ ਰਹੇ ਹੋ, ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3869,471 +4105,440 @@ msgstr ""
 "\n"
 "ਗਲਤੀ: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "VPN ਕਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "ਅਣ-ਲਾਕ(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "ਇਹ ਜੰਤਰ ਆਟੋਮੈਟਿਕ ਅਣ-ਲਾਕ ਕਰੋ"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "ਬੰਦ ਕਰੋ(_C)"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "ਸਰਗਰਮ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਸੈੱਟ ਨਹੀਂ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "ਕੋਈ ਕੁੰਜੀ ਸੈੱਟ ਨਹੀਂ ਹੈ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੁੰਜੀ ਚੁਣੋ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "%s ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "%s ਕੁੰਜੀ ਪਾਸਵਰਡ(_p):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ(_c):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ਤੁਹਾਡਾ ਜੰਤਰ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ਤੁਹਾਡਾ ਪਰੋਵਾਇਡਰ:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "ਤੁਹਾਡਾ ਪਲੈਨ:"
-
-#: ../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."
-msgstr ""
-"ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਕਨੈਕਸ਼ਨ"
-" ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
-"ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ"
-" ਸੈਟਿੰਗਾਂ ਫੇਰ ਚੈੱਕ ਕਰੋ। ਆਪਣੀ "
-"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ → ਪਸੰਦ ਮੇਨੂ ਤੋਂ ”ਨੈੱਟਵਰਕ"
-" ਕਨੈਕਸ਼ਨ” ਚੁਣੋ। "
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ਬਿਨ-ਲਿਸਟ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "ਆਪਣਾ ਪਲੈਨ ਚੁਣੋ(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "ਚੁਣਿਆ ਪਲੈਨ _APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨੇਮ):"
-
-#: ../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."
-msgstr ""
-"ਸਾਵਧਾਨ: ਗਲਤ ਪਲੈਨ ਚੁਣਨ ਨਾਲ ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਅਕਾਊਂਟ ਲਈ ਬਿੱਲ ਦਾ ਮੁੱਦਾ ਹੋ ਸਕਦਾ ਹੈ"
-" ਜਾਂ ਕਨੈਕਟਵਿਟੀ "
-"ਰੁਕ ਸਕਦੀ ਹੈ।\n"
-"\n"
-"ਜੇ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਲੈਨ ਬਾਰੇ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨੂੰ ਆਪਣੇ ਪਲੈਨ ਦੇ"
-" APN ਬਾਰੇ ਪਤਾ ਕਰੋ।"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ਆਪਣਾ ਬਿੱਲ ਪਲੈਨ ਚੁਣੋ"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "ਮੇਰਾ ਪਲੈਨ ਲਿਸਟ 'ਚ ਨਹੀਂ ਹੈ…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "ਲਿਸਟ ਤੋਂ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ(_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ਪਰੋਵਾਇਡਰ"
 
-#: ../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:"
-msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ਪਰੋਵਾਇਡਰ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr ""
-"ਮੇਰਾ ਪਰੋਵਾਇਡਰ GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ CDMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਲਿਸਟ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
-msgstr "ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਦਾ ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ GSM ਜੰਤਰ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ CDMA ਜੰਤਰ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr ""
-"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ"
-" ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
+"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਚਾਹੀਦੀ ਹੈ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਦਾ ਨਾਂ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ ਨਾਂ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(ਕੁਝ ਹਾਲਤਾਂ ਵਿੱਚ) ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਾਂ)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ਇਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ ਇੱਕ ਕਨੈਕਸ਼ਨ ਬਣਾਓ(_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬਾਂਡ ਕਨੈਕਸ਼ਨ ਸੈੱਟਅੱਪ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
+msgstr "ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਦਾ ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "ਲਿਸਟ ਤੋਂ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ(_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ CDMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "ਆਪਣਾ ਪਲੈਨ ਚੁਣੋ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ਚੁਣਿਆ ਪਲੈਨ _APN (ਅਸੈੱਸ ਪੁਆਇੰਟ ਨੇਮ):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+"ਸਾਵਧਾਨ: ਗਲਤ ਪਲੈਨ ਚੁਣਨ ਨਾਲ ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਅਕਾਊਂਟ ਲਈ ਬਿੱਲ ਦਾ ਮੁੱਦਾ ਹੋ ਸਕਦਾ ਹੈ ਜਾਂ ਕਨੈਕਟਵਿਟੀ "
+"ਰੁਕ ਸਕਦੀ ਹੈ।\n"
+"\n"
+"ਜੇ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਲੈਨ ਬਾਰੇ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨੂੰ ਆਪਣੇ ਪਲੈਨ ਦੇ APN ਬਾਰੇ ਪਤਾ ਕਰੋ।"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ਆਪਣਾ ਬਿੱਲ ਪਲੈਨ ਚੁਣੋ"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ਤੁਹਾਡਾ ਜੰਤਰ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ਤੁਹਾਡਾ ਪਰੋਵਾਇਡਰ:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "ਤੁਹਾਡਾ ਪਲੈਨ:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
+"ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਕਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
+"ਕਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ ਸੈਟਿੰਗਾਂ ਫੇਰ ਚੈੱਕ ਕਰੋ। ਆਪਣੀ "
+"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ → ਪਸੰਦ ਮੇਨੂ ਤੋਂ ”ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ” ਚੁਣੋ। "
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "%s ਵਿੱਚ ਕੁੰਜੀ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(ਅਣਪਛਾਤਾ)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "ਚੁਣੋ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "ਫਾਇਲ ਤੋਂ ਚੁਣੋ…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
-#, c-format
-msgid "%s certificate _password:"
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
 msgstr "%s ਸਰਟੀਫਿਕੇਟ ਪਾਸਵਰਡ(_p):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "ਅਣ-ਲਾਕ ਟੋਕਨ(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "ਜਾਰੀ ਕੀਤਾ ਵਲੋਂ"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "%s ਪਿੰਨ ਦਿਓ"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "ਲਾਗਇਨ(_L)"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "ਪਿੰਨ ਯਾਦ ਰੱਖੋ(_R)"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "ਸਿਰਫ਼ ਇਹ ਵਰਤੋਂਕਾਰ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਲਈ ਪੁੱਛੋ"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "ਪਾਸਵਰਡ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "ਤੀਜੇ ਪੱਧਰ ਦਾ ਪਾਸਵਰਡ(_T):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "ਕਨੈਕਟ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "ਨਵਾਂ…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ “%s“ ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਜਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ ਵਲੋਂ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ ਬਣਾਓ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "ਨਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Wi-Fi ਨੈੱਟਵਰਕ, ਜੋ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਦਿਓ।"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "ਲੁਕਵਾਂ Wi-Fi ਨੈੱਟਵਰਕ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr ""
-"ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ"
-" ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
+msgstr "ਲੁਕਵੇਂ Wi-Fi ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "ਕਨੈਕਸ਼ਨ(_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ਮੈਨੂੰ ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਨਹੀਂ ਮਿਲਿਆ ਅਤੇ ਮੈਂ ਖੁਦ ਦੇਣਾ ਚਾਹੁੰਦਾ ਹਾਂ(_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ਪਰੋਵਾਇਡਰ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਲਿਸਟ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "ਤਾਰ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC ਮਿਸ਼"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4343,17 +4548,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi ਸੁਰੱਖਿਆ(_s):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ਕਨੈਕਸ਼ਨ(_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi ਅਡੈਪਟਰ(_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ਵਰਤੋਂ:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4361,399 +4588,485 @@ msgstr ""
 "ਇਹ ਪਰੋਗਰਾਮ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਦਾ ਭਾਗ ਹੈ (https://wiki.gnome.org/Projects/"
 "NetworkManager/)"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
-"ਇਹ ਕਮਾਂਡ-ਲਾਈਨ ਲਈ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਬਲਕਿ ਗਨੋਮ ਡੈਸਕਟਾਪ ਇੰਵਾਇਰਨਮੈਂਟ 'ਚ ਚਲਾਉਣ ਲਈ"
-" ਹੈ।"
+"ਇਹ ਕਮਾਂਡ-ਲਾਈਨ ਲਈ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਬਲਕਿ ਗਨੋਮ ਡੈਸਕਟਾਪ ਇੰਵਾਇਰਨਮੈਂਟ 'ਚ ਚਲਾਉਣ ਲਈ ਹੈ।"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ਯੋਗ ਨਹੀਂ"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ਘਰ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ਘਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਪਾਬੰਦੀ ਹੈ"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ਰੋਮਿੰਗ)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ਰੋਮਿੰਗ)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ਰੋਮਿੰਗ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ਰੋਮਿੰਗ ਨੈੱਟਵਰਕ"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "“%2$s“ 'ਤੇ SIM ਕਾਰਡ “%1$s“ ਲਈ ਪਿੰਨ ਕੋਡ"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN ਕੋਡ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ PIN ਕੋਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕਨੈਕਸ਼ਨ “%s“ ਸਰਗਰਮ: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ਰੋਮਿੰਗ"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s ਕਨੈਕਸ਼ਨ"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM ਸਰਟੀਫਿਕੇਟ (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ਜਾਂ PKCS#12 ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1x ਸੁਰੱਖਿਆ (wpa-eap) ਵਿੱਚ ਨਾ-ਪਰਿਭਾਸ਼ਿਤ ਗ਼ਲਤੀ"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "ਚੁਣੀ ਗਈ CA ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "ਗੁੰਮ EAP-FAST PAC ਫਾਇਲ"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "PAC ਫਾਇਲ ਚੁਣੋ"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ਫਾਇਲਾਂ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "ਅਗਿਆਤ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "ਪਰਮਾਣਿਤ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "ਦੋਵੇਂ"
 
-#: ../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:3
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "ਅਗਿਆਤ ਪਛਾਣ(_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC ਫਾਇਲ(_f):"
 
-#: ../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:1
-msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Inner ਪਰਮਾਣਕਿਤਾ:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ਆਟੋਮੈਟਿਕ PAC ਪਰੋਵਿਜ਼ਨਿੰਗ ਮਨਜ਼ੂਰ(_v)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "ਗੁੰਮ EAP-LEAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "ਗੁੰਮ EAP-LEAP ਪਾਸਵਰਡ"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "ਵਰਜਨ 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "ਵਰਜਨ 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚਾਹੀਦਾ(_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP ਵਰਜਨ(_v):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
-msgid "_Domain:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+#, fuzzy
+msgid "_Domain"
 msgstr "ਡੋਮੇਨ(_D):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "ਗੁੰਮ EAP ਵਰਤੋਂਕਾਰ-ਨਾਂ"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "ਗੁੰਮ EAP-TLS ਪਛਾਣ"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "ਕੋਈ ਕੁੰਜੀ ਨਹੀਂ ਚੁਣੀ"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "ਚੁਣੀ ਗਈ ਕੁੰਜੀ ਫਾਇਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "ਪਛਾਣ(_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (EAP ਨਹੀਂ)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "802.1x ਸੁਰੱਖਿਆ ਦੀ ਪ੍ਰਮਾਣਕਿਤ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ਟਨਲ TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "ਸੁਰੱਖਿਅਤ EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "ਪਰਮਾਣਕਿਤਾ(_t):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "leap-ਵਰਤੋਂਕਾਰ ਗੁੰਮ"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "ਗੁੰਮ ਲੀਪ-ਪਾਸਵਰਡ"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-key ਗੁੰਮ"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: %zu ਲੰਬਾਈ ਦੀ ਕੁੰਜੀ ਵਿੱਚ ਕੇਵਲ ਹੈਕਸਾ-ਅੰਕ ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr ""
-"ਅਢੁੱਕਵੀਂ wep-key: %zu ਲੰਬਾਈ ਦੀ ਕੁੰਜੀ ਵਿੱਚ ਕੇਵਲ ASCII ਅੱਖਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
+msgstr "ਅਢੁੱਕਵੀਂ wep-key: %zu ਲੰਬਾਈ ਦੀ ਕੁੰਜੀ ਵਿੱਚ ਕੇਵਲ ASCII ਅੱਖਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
-"ਅਢੁੱਕਵੀਂ wep-key: ਗ਼ਲਤ %zu ਕੁੰਜੀ ਲੰਬਾਈ। ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ ਜਾਂ ਤਾਂ 5/13 (ascii)"
-" ਜਾਂ 10/26 "
+"ਅਢੁੱਕਵੀਂ wep-key: ਗ਼ਲਤ %zu ਕੁੰਜੀ ਲੰਬਾਈ। ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ ਜਾਂ ਤਾਂ 5/13 (ascii) ਜਾਂ 10/26 "
 "(ਹੈਕਸਾ) ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ ਖਾਲੀ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ਅਢੁੱਕਵੀਂ wep-key: ਵਾਕ 64-ਅੱਖਰਾਂ ਤੋਂ ਛੋਟਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ਓਪਨ ਸਿਸਟਮ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ਸ਼ੇਅਰ ਕੁੰਜੀ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (ਡਿਫਾਲਟ)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "ਕੁੰਜੀ(_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "ਕੁੰਜੀ ਵੇਖੋ(_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP ਇੰਡੈਕਸ(_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
-"ਅਢੁੱਕਵੀਂ wpa-psk: ਕੁੰਜੀ-ਲੰਬਾਈ %zu ਅਵੈਧ ਹੈ। ਜਾਂ ਤਾਂ [8,63] ਬਾਈਟ ਜਾਂ 64"
-" ਹੈਕਸਾ-ਅੰਕ ਹੋਣੀ ਚਾਹੀਦੀ "
-"ਹੈ।"
+"ਅਢੁੱਕਵੀਂ wpa-psk: ਕੁੰਜੀ-ਲੰਬਾਈ %zu ਅਵੈਧ ਹੈ। ਜਾਂ ਤਾਂ [8,63] ਬਾਈਟ ਜਾਂ 64 ਹੈਕਸਾ-ਅੰਕ ਹੋਣੀ "
+"ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ਅਢੁੱਕਵੀਂ wpa-psk: 64 ਬਾਈਟਾਂ ਨੂੰ ਹੈਕਸਾ ਨਾਲ ਅਰਥ ਕੱਢੇ ਨਹੀਂ ਜਾ ਸਕਦੇ"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ਟਾਈਪ(_T):"
 
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "ਮੋਡ(_M):"
+#~ msgid "%s (default)"
+#~ msgstr "%s (ਡਿਫਾਲਟ)"
 
-#, fuzzy
-#~ msgid "MTU"
-#~ msgstr "_MTU:"
+#~ msgid "Ignored"
+#~ msgstr "ਅਣਡਿੱਠਾ"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਕਰਕੇ ਕਨੈਕਸ਼ਨ ਸੀਕਰਟ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "ਜਦੋਂ ਵੀ ਉਪਲੱਬਧ ਹੋਵੇ ਤਾਂ ਇਹ ਨੈੱਟਵਰਕ ਨਾਲ ਆਪਣੇ-ਆਪ ਹੀ ਕਨੈਕਟ ਕਰੋ(_A)"
+
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "ਆਟੋ-ਸਰਗਰਮ ਲਈ ਕਨੈਕਸ਼ਨ ਤਰਜੀਹ(_p):"
+
+#~| msgid "M_ode:"
+#~ msgid "Mode:"
+#~ msgstr "ਮੋਡ:"
+
+#~| msgid "_MTU:"
+#~ msgid "MTU:"
+#~ msgstr "MTU:"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN ਕਨੈਕਸ਼ਨ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ਫਾਇਲ ”%s” ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ ਜਾਂ ਪਛਾਣਯੋਗ VPN ਕਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ।\n"
+#~ "\n"
+#~ "ਗਲਤੀ: %s।"
+
+#~ msgid "unknown error"
+#~ msgstr "ਅਣਪਛਾਤੀ ਗਲਤੀ"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "ਸਰਗਰਮ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"
 
 #, fuzzy
 #~ msgid "Choose a Certificate Authority certificate"
@@ -4798,30 +5111,6 @@ msgstr "ਟਾਈਪ(_T):"
 #~ 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"
 
@@ -5075,9 +5364,6 @@ msgstr "ਟਾਈਪ(_T):"
 #~ msgid "Error: %s"
 #~ msgstr "ਗਲਤੀ: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "ਤੁਹਾਡਾ ਫੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੈ!"
 
@@ -5118,15 +5404,6 @@ msgstr "ਟਾਈਪ(_T):"
 #~ msgid "%s Network"
 #~ msgstr "%s ਨੈੱਟਵਰਕ"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "ਪ੍ਰਾਇਮਰੀ DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "ਸੈਕੰਡਰੀ DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ਤ੍ਰਿਨਰੀ DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "ਸੰਭਾਲੋ(_S)..."
 
@@ -5147,15 +5424,6 @@ msgstr "ਟਾਈਪ(_T):"
 #~ "ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ (CA) ਸਰਟੀਫਿਕੇਟ ਦੀ ਵਰਤੋਂ ਨਾ ਕਰਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਸੁਰੱਖਿਅਤ, ਠੱਗ ਵਾਈ-ਫਾਈ "
 #~ "ਨੈੱਟਵਰਕ ਹੋ ਸਕਦੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਟੀਫਿਕੇਟ ਚੁਣਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#~ msgid "No"
-#~ msgstr "ਨਹੀਂ"
-
-#~ msgid "Yes"
-#~ msgstr "ਹਾਂ"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਕਰੋ(_a)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "ਸਭ ਯੂਜ਼ਰ ਲਈ ਉਪਲੱਬਧ"
 
diff --git a/po/pl.po b/po/pl.po
index 0eab4681..08718c8b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-05-24 09:53+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-05-27 18:44+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198 src/applet-dialogs.c:737
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
 #: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Sieć"
@@ -451,117 +451,117 @@ msgstr "urządzenie nieobsługiwane"
 msgid "No network devices available"
 msgstr "Brak dostępnych urządzeń sieciowych"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Połączenia _VPN"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "S_konfiguruj VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Dodaj połączenie VPN…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Usługa NetworkManager nie jest uruchomiona…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Sieć jest wyłączona"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Sieć"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Sieć _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Sieć _komórkowa"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "P_owiadomienia"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "I_nformacje o połączeniu"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Modyfikuj połączenia…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O programie"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Połączono z „%s”."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Połączenie sieciowe zostało rozłączone."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Przygotowywanie połączenia sieciowego „%s”…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Wymagane uwierzytelnienie dla połączenia sieciowego „%s”…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Żądanie adresu sieciowego dla „%s”…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Nawiązano połączenie sieciowe „%s”"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Nawiązywanie połączenia VPN „%s”…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Wymagane uwierzytelnienie dla połączenia VPN „%s”…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Żądanie adresu VPN dla „%s”…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Nawiązano połączenie VPN"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Brak połączenia sieciowego"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
@@ -1106,17 +1106,17 @@ msgstr "Proszę ponownie wprowadzić nowy kod PIN:"
 msgid "Show PIN/PUK codes"
 msgstr "Wyświetlanie kodów PIN/PUK"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Połączenie nie ma ustawienia VPN"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr ""
 "Zapisanie połączenia do interfejsu użytkownika VPN się nie powiodło: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Zapisanie połączenia do interfejsu użytkownika VPN się nie powiodło: "
diff --git a/po/pt.po b/po/pt.po
index 789ae4aa..451730dd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2015-12-19 08:19+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Português <palbuquerque73@gmail.com>\n"
@@ -20,47 +21,56 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rede"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Controle as suas ligações de rede"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Ligações de rede"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Configuração_manual"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gerir e alterar as suas definições da ligação de rede"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Desativar as notificações de ligado"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Defina como verdadeiro para desativar notificações ao ligar a uma rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Desativar as notificações de desligado"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Defina como verdadeiro para desativar notificações ao desligar de uma rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Desativar as notificações de VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -68,53 +78,54 @@ msgstr ""
 "Defina como verdadeiro para desativar notificações ao ligar ou desligar de "
 "uma rede."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Não mostrar notificações de redes sem fios disponíveis"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Defina como verdadeiro para desativar notificações quando estão disponíveis "
 "redes Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Carimbo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Usado para determinar se as definições devem ser migradas para uma nova "
 "versão."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Desativar criação de Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Defina como verdadeiro para desativar a criação de redes adhoc ao usar a "
 "applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Mostrar a applet na área de notificação"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Definir como FALSO para desativar a exibição da applet na área de "
 "notificação."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorar o certificado da AC"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -122,7 +133,7 @@ msgstr ""
 "Defina como verdadeiro para desativar avisos sobre os certificados das ACs "
 "(Autoridades de Certificação) na autenticação EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -130,16 +141,16 @@ msgstr ""
 "Defina como verdadeiro para desativar avisos sobre certificados de ACs na 2ª "
 "fase da autenticação EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Gestor de rede"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Sem ligação à rede"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -147,7 +158,7 @@ msgstr ""
 "O Gestor de redes é um serviço do sistema para gerir e configurar os seus "
 "dispositivos e ligações de rede."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -155,107 +166,120 @@ msgstr ""
 "O programa nm-connection-editor trabalha com o Gestor de redes para criar e "
 "editar perfis de ligação existentes."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "- Propriedade VPN do NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticação 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Ligar"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nome da rede:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "segura."
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Falha ao adicionar/ativar ligação"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Ligação falhou"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Falha ao desligar dispositivo"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Falha ao desligar"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Falha ao ativar a ligação"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Não mostrar esta mensagem novamente"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -265,7 +289,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" desligou-se porque a ligação de rede foi interrompida."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +299,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque a ligação de rede foi interrompida."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -284,7 +308,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque o serviço VPN parou inesperadamente."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +319,7 @@ msgstr ""
 "A ligação VPN \"%s\" falhou porque o serviço VPN devolveu uma configuração "
 "inválida."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -304,7 +328,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque a tentativa de ligação expirou."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -313,7 +337,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\"  falhou porque o serviço VPN não se iniciou a tempo."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -322,7 +346,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque o serviço VPN falhou ao iniciar."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -331,7 +355,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque não haviam segredos VPN válidos."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -340,7 +364,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou por causa de segredos VPN inválidos."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -349,7 +373,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -360,19 +384,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "A ligação VPN foi estabelecida com sucesso.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mensagem de início de sessão VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Ligação VPN falhou"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -385,7 +409,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -398,561 +422,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo não preparado (firmware em falta)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "dispositivo não preparado"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desligado"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Desligar"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "dispositivo não gerido"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Ligações _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Adicionar uma nova ligação VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Gestor de Rede não está em execução"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Rede inativada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Ativar a _Rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Ativar _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Ativar banda larga _Móvel"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Ativar n_Otificações"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informação de ligação"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Editar ligações..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Encontra-se agora ligado a \"%s\"."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desligado"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "A ligação de rede foi terminada."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "A preparar ligação de rede \"%s\"..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Autenticação de usador necessária para ligação de rede \"%s\"..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "A pedir um endereço de rede para \"%s\"..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Ligação de rede \"%s\" ativa"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "A iniciar ligação VPN \"%s\"..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Autenticação de usador necessária para ligação VPN \"%s\"..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "A pedir um endereço de rede VPN para \"%s\"..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Ligação VPN \"%s\" ativa"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Sem ligação à rede"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplicação Gestor de redes"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Código PUK errado; por favor, contacte o seu fornecedor."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Código PIN errado; por favor, contacte o seu fornecedor."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "A enviar código de desbloqueio..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móvel (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponível"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Nova ligação de banda larga móvel"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Ligação estabelecida"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Encontra-se agora ligado à rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Encontra-se agora registado na rede de casa."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Encontra-se agora registado numa rede de roaming."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Encontra-se agora ligado à rede de banda larga móvel."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "A preparar ligação de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "A configurar ligação de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Autenticação de usador necessária para ligação de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Ligação de banda larga móvel \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automática"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rede Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Encontra-se agora ligado à rede ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "A preparar a ligação de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "A configurar a ligação de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Autenticação de usador é necessária para ligação de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "A pedir um endereço de rede ethernet para \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Ligação de rede ethernet \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticação DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_Aceitar"
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Ligar a uma rede Wi-Fi oculta"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Criar uma nova rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Falha ao adicionar uma nova ligação"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede Wi-Fi"
 msgstr[1] "Redes Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi está desativada"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi está desativada por interruptor físico"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Mais redes"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Redes Wi-Fi disponíveis"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Use o menu de rede para ligar a uma rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Encontra-se agora ligado à rede Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "A preparar a ligação de rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "A configurar a ligação de rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Autenticação de usador necessária para a rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "A pedir um endereço de rede Wi-Fi para \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Ligação de rede Wi-Fi \"%s\" ativa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Ligação de rede Wi-Fi \"%s\" ativa"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Falha ao ativar a ligação"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Erro ao mostrar informação de ligação:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Mais endereços"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (predefinição)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Endereço de Broadcast"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Máscara de subrede"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS primário:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS secundário:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS terciário:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Geral"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Ambiente"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Endereço físico (MAC)"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Controlador"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Segurança:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Rota predefinida"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorado"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Hotspot"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Senha:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipo de VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Gateway VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Utilizador VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Anúncio VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Ligação base"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nenhuma ligação ativa válida encontrada!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -960,18 +1010,24 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e muitos outros contribuintes e tradutores da comunidade"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplicação de área de notificação para gerir os seus dispositivos de rede e "
 "ligações."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Página web do Gestor de redes"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"Filipe Gomes <filipefgomes@gmail.com>\n"
+"Duarte Loreto <happyguy_pt@hotmail.com>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -979,33 +1035,33 @@ msgstr ""
 "O Gestor de redes não pôde encontrar alguns recursos necessários (o "
 "ficheiro .ui não foi encontrado)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Faltam recursos"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Senha da rede de banda larga móvel"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "É necessária uma senha para ligar a \"%s\"."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Necessário desbloqueio do PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Necessário desbloqueio do PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1015,25 +1071,25 @@ msgstr ""
 "poder ser usado."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Mostrar código PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Necessário desbloqueio do PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Necessário desbloqueio do PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1043,35 +1099,42 @@ msgstr ""
 "poder ser usado."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Novo código PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Reinsira o novo código PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_Aceitar"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Informação de ligação"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Falhou a criação da ligação DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1080,57 +1143,57 @@ msgstr ""
 "Endereços de IP identificam o seu computador na rede.  Clique no botão "
 "\"Adicionar\" para adicionar um endereço de IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Adicionar"
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_Norar rotas obtidas automaticamente"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Usar esta ligação apenas para recursos na sua rede"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Se ativado, esta ligação nunca será usada com a ligação de rede predefinida."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Criar…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Selecione um tipo de ligação"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1142,85 +1205,100 @@ msgstr ""
 "Se estiver a criar uma VPN e o tipo de ligação VPN que deseja criar não "
 "aparece na lista, poderá não ter a extensão VPN correta instalada."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Serviço:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Recurso ativo"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Balanceamento de carga de transmissão adaptativo"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Balanceamento de carga adaptativo"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomendado)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Ligações asso_Ciadas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_Odo:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Frequência de monitorização:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Nome do _Ambiente:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Monitorização da _Ligação:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Alvos ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1228,19 +1306,22 @@ msgstr ""
 "Um endereço IP, ou uma lista separada por vírgulas de endereços IP, a "
 "verificar na monitorização do estado da ligação."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Atraso de _Transmissão da ligação:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Atraso de _Receção da ligação:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "DNS primário:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1248,104 +1329,162 @@ msgstr ""
 "O nome do ambiente do dispositivo primário. Se definido, este dispositivo "
 "será sempre o escravo ativo quando estiver disponível."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bytes"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Custo do caminho:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioridade:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Modo _Hairpin:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Ligações em _Ponte:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Atraso no _Encaminhamento:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Tempo de _Hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Ativar bisbilhotar I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Ativar _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Idade _Máxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Tempo de _Envelhecimento:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automático"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predefinição"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "Erro não especificado"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Ativar"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1356,192 +1495,233 @@ msgstr ""
 "de rede onde esta ligação está ativa.  Esta funcionalidade é conhecida como "
 "clonagem MAC ou \"spoofing\".  Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Endereço MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Endereço HW"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "inválido %s para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "inválido %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, fuzzy, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "nome de ambiente inválido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "nome de ambiente inválido (%s)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Endereço físico (MAC):"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, fuzzy, c-format
 msgid "invalid %s (%s): "
 msgstr "inválido %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "dispositivo"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, fuzzy, c-format
 msgid "invalid %s (%s) "
 msgstr "inválido %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Impossível atualizar segredos da ligação devido a um desconhecido."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Usar Data Center Bridging (DCB) para esta ligação"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Controlo de fluxo"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funcionalidade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Ativar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Publicitar"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Desejo"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Opções..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grupos de prioridade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Tecido"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Controlo de fluxo de prioridade"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Ativar ou desativar transmissão de prioridade de pausa para cada prioridade "
 "de usador."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prioridade:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Classe de tráfego:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Largura de banda estrita:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Largura de banda de prioridade:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Largura de banda de grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ID de grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Insira a ID de grupo de prioridade para cada prioridade de usador."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1549,242 +1729,306 @@ msgstr ""
 "Insira a percentagem de largura de banda de ligação que cada grupo de "
 "prioridade pode usar. O total dos grupos tem de ser 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Insira a percentagem de largura de banda de grupo de prioridade que cada "
 "prioridade de usador pode usar."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Ativar ou desativar largura de banda estrita para cada prioridade de usador."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Insira a classe de tráfego para cada prioridade de usador."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Utilizador:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Serviço:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Mostrar senha"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Senha:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Ambiente"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Ambiente _Pai:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Ambiente _Pai:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Par cruzado (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Ambiente de unidade de anexos (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Ambiente independente do suporte (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Porta:"
 
-#: ../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 "_Serviço:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "Endereço MAC c_Lonado:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "Acordar na LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Prede_Finição"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_Ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_Gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "Senha de _Acordar na LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Senha de Acoradr na LAN (uma Ethernet MAC). Só é válida para pacotes mágicos"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Velocidade:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Duple_X total"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Ligar automaticamente à _VPN quando usar esta ligação"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Nenhum"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Todos os _Utilizadores se podem ligar a esta rede"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "Ligar _Automaticamente a esta rede quando estiver disponível"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Ligar automaticamente à _VPN quando usar esta ligação"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Informação de ligação"
+msgid "Firewall _zone"
+msgstr "_Zona de firewall:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Ligações asso_Ciadas:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Ligar _automaticamente"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Zona de firewall:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1793,7 +2037,7 @@ msgstr ""
 "Endereços de IP identificam o seu computador na rede.  Clique no botão "
 "\"Adicionar\" para adicionar um endereço de IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1801,128 +2045,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Automático, apenas endereços"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Endereços"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Modo de _Transporte:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Ligado"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Modo de _Transporte:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Nome + número do dispositivo"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Modo:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automático com definições de DNS manuais"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Partilhada com outros computadores"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Método:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1933,8 +2181,8 @@ msgstr ""
 "personalizar a configuração do seu computador. Se quiser usar um identificar "
 "de cliente DHCP, insira-o aqui."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1942,25 +2190,26 @@ msgstr ""
 "Domínios usados ao resolver nomes de máquinas. Use virgulas para separar "
 "vários domínios."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID do cliente D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Domínios de _procura:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Servidores _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1969,11 +2218,11 @@ msgstr ""
 "nomes de máquinas. Use virgulas para separar vários endereços de servidores "
 "de nomes de domínios."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Requerer endereçamento IPv_4 para completar esta ligação"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1981,25 +2230,35 @@ msgstr ""
 "Ao ligar a redes capazes de IPv6, permitir que a ligação complete se a "
 "configuração IPv4 falhar mas a configuração IPv6 for bem sucedida."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rotas..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Desativado"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Ativado (preferir endereço público)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Ativado (preferir endereço temporário)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Ativar"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2010,15 +2269,20 @@ msgstr ""
 "de nomes de domínios. Endereços Link-Local serão automaticamente ajustados "
 "ao ambiente de ligação."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Extensões de _Privacidade IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Requerer endereçamento IPv_6 para completar esta ligação"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2026,754 +2290,864 @@ msgstr ""
 "Ao ligar a redes capazes de IPv4, permitir que a ligação complete se a "
 "configuração IPv6 falhar mas a configuração IPv4 for bem sucedida."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Métrico"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Importar"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nú_Mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID da r_Ede:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Alterar..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Permitir _Roaming se a rede doméstica não estiver disponível"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Mostrar senhas"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Métodos permitidos:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "_Métodos de configuração..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compressão"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Usar encriptação ponto-a-ponto (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Exigir encriptação de 128-bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Usar MPPE com e_Stados"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permitir compressão de dados _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permitir compressão de dados _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Usar compressão de cabeçal_Hos TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eco"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "_Enviar pacotes de eco PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Método:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Importar configuração de equipa gravada..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Método:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Avançado"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Redes Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prioridade:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioridade:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prioridade:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_Chave privada:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Atraso de _Transmissão da ligação:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Atraso de _Receção da ligação:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Ambiente _Pai:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Alvos ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Alvos ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Im_Portar configuração de equipa gravada..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Configuração _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "Configuração_manual"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Largura de banda de grupo:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prioridade"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Ligações asso_Ciadas:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Endereço físico (MAC):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Endereço físico (MAC):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prioridade:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Potência de _Transmissão:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Potência de _Transmissão:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Ambiente _Pai:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "_Nome do ambiente VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "Endereço MAC _Clonado:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_Id VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Parâmetros:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Reordenar cabeçalhos"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Associação solta"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Nome + número do dispositivo"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + número"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "S_Egurança:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Cliente"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Hotspot"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Potência de _Transmissão:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Taxa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "Ca_Nal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_Da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Sem autorização do polkit para realizar a ação."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Métodos de autenticação permitidos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Protocolo de Autenticação Extensível"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protocolo de Autenticação por Senha"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versão 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2783,110 +3157,99 @@ msgstr ""
 "autenticação. Se a ligação falhar, tente desativar o suporte de alguns "
 "métodos."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Associar"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Equipa"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Ponte"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"A extensão VPN falhou ao importar a ligação VPN corretamente\n"
-"\n"
-"Erro: tipo de serviço VPN inexistente."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Impossível importar a ligação VPN"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"O ficheiro \"%s\" não pôde ser lido ou não contem informação de ligação VPN "
-"reconhecível\n"
+"A extensão VPN falhou ao importar a ligação VPN corretamente\n"
 "\n"
-"Erro: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
-msgstr "erro desconhecido"
+"Erro: tipo de serviço VPN inexistente."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Selecione o ficheiro a importar"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Equipamento"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Importar uma ligação VPN gravada..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2894,77 +3257,84 @@ msgstr ""
 "Impossível inicializar diálogo do editor de ligação devido a um erro "
 "desconhecido."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Impossível criar nova ligação"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Falha ao eliminar ligação"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Tem a certeza de que quer eliminar a ligação %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Ligações _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Máscara de rede"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "A editar %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "A editar ligação anónima"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Nome da ligação em falta"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "A inicializar editor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Impossível modificar ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Definição inválida %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2972,55 +3342,52 @@ msgstr ""
 "O editor de ligação não pôde encontrar alguns recursos necessários (o "
 "ficheiro .ui não foi encontrado)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Gravar quaisquer alterações feitas a esta ligação."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentique-se para gravar esta ligação para todos os utilizadores deste "
 "computador."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Impossível criar a ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Impossível editar ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Erro desconhecido ao criar o diálogo de edição de ligação."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Erro ao inicializar editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Adição de ligação falhou"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3029,196 +3396,242 @@ msgstr ""
 "Defina como verdadeiro para desativar avisos sobre os certificados das ACs "
 "(Autoridades de Certificação) na autenticação EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nome da ligação:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Exportar..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "etiqueta"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "etiqueta"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ano atrás"
 msgstr[1] "%d anos atrás"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Impossível modificar ligação"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Ligação de equipa %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Ligação de equipa %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Última utilização"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Editar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentique-se para editar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Eliminar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentique-se para eliminar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Tipo de ligação de banda larga móvel não suportado."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Desconhece-se como criar ligações \"%s\""
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Erro ao editar ligação"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Erro ao criar ligação"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Impossível modificar ligação"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Não tem extensões VPN instaladas"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Desconhece-se como criar ligações \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Erro ao editar ligação"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Não foi encontrada ligação com UUID \"%s\""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Ligações de rede"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Adicionar uma nova ligação VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Segurança 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Impossível carregar o ambiente de utilizador de segurança 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar segurança 802.1_X para esta ligação"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Impossível carregar o ambiente de utilizador de Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "incapaz de encontrar o dispositivo Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Ligação Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Tipo de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Selecione o tipo de perfil de ligação Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Rede de área _Pessoal"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Rede por _Modem"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Impossível carregar o ambiente de utilizador de associação."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primário"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Ligação associada %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Impossível carregar o ambiente de utilizador de ponte."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Ligação de ponte %d"
@@ -3226,32 +3639,37 @@ msgstr "Ligação de ponte %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Porta da ponte"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Impossível ler o ambiente de utilizador de porta da ponte."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Impossível carregar o ambiente de utilizador de DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Impossível carregar o ambiente de utilizador de DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Ambiente _Pai:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ligação DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3262,42 +3680,41 @@ msgstr ""
 "por nome deste ambiente, seja por endereço MAC permanente ou ambos. "
 "Exemplos: \"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorado"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Impossível carregar o ambiente de utilizador de ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "MAC clonado"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Senha de Acordar na LAN"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ligação ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Predefinição"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3307,11 +3724,11 @@ msgstr ""
 "zona normal, selecioná-lo resulta na utilização da zona predefinida na "
 "firewall. Apenas utilizável se a firewall estiver ativa."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Impossível carregar o ambiente de utilizador geral."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3325,158 +3742,162 @@ msgstr ""
 "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:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossível carregar o ambiente de utilizador de InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "Dispositivo infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Ligação InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Impossível carregar ambiente de utilizador IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Ligação ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Só endereços automáticos (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automático, apenas endereços"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Só endereços automáticos (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Só endereços automáticos (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Só Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Servidores _DNS adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Domínios de _Procura adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "A editar rotas IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Definições IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Impossível carregar ambiente de utilizador IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, fuzzy, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Endereço \"%s\" IPv4 inválido"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, fuzzy, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Máscara de rede de endereço IPv4 \"%s\" inválida"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, fuzzy, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Gateway IPv4 \"%s\" inválida"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, fuzzy, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv4 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automático, só DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "A editar rotas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Definições IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Impossível carregar ambiente de utilizador IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, fuzzy, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Endereço \"%s\" IPv6 inválido"
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, fuzzy, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Prefixo \"%s\" IPv6 inválido"
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, fuzzy, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Gateway IPv6 \"%s\" inválida"
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, fuzzy, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Servidor DNS IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Impossível carregar o ambiente de utilizador de WiMAX."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Ligação WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Escravos duplicados"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Ambos os escravos \"%s\" e \"%s\" se aplicam ao dispositivo \"%s\""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3485,25 +3906,25 @@ msgstr ""
 "Os escravos \"%s\" e \"%s\" aplicam-se a diferentes portas virtuais (\"%s\" "
 "e \"%s\") do mesmo dispositivo físico."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s escrava %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Impossível carregar ambiente de utilizador de banda larga móvel."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tipo de ligação de banda larga móvel não suportado."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Selecione o tipo de fornecedor de banda larga móvel"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3512,7 +3933,7 @@ msgstr ""
 "Selecione a tecnologia usada pelo seu fornecedor de banda larga móvel. Se "
 "não tem a certeza, pergunte ao seu fornecedor."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "O meu fornecedor utiliza tecnologia baseada em _GSM (ex: GPRS, EDGE, UMTS, "
@@ -3520,84 +3941,80 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "O meu fornecedor utiliza tecnologia baseada em C_DMA (ex: 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nenhum"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "A editar métodos de autenticação PPP para %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Definições PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Impossível carregar ambiente de utilizador de PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Impossível carregar o ambiente de utilizador de associação."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Erro: o ficheiro não contém uma configuração JSON válida"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Impossível carregar o ambiente de utilizador de equipa."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Ligação de equipa %d"
@@ -3605,69 +4022,69 @@ msgstr "Ligação de equipa %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Porta da equipa"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Impossível carregar o ambiente de utilizador de porta da equipa."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Nova ligação..."
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Impossível carregar o ambiente de utilizador de vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "Pai de vlan"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Ligação VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Impossível carregar ambiente de utilizador VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Impossível encontrar um serviço de extensão VPN para \"%s\"."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Impossível encontrar um serviço de extensão VPN para \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Ligação falhou"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Impossível carregar ambiente de utilizador VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Impossível encontrar um serviço de extensão VPN para \"%s\"."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ligação VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Escolha um tipo de ligação VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3678,7 +4095,7 @@ msgstr ""
 "ligação VPN que deseja criar não aparece na lista, pode não ter a extensão "
 "VPN correta instalada."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3687,7 +4104,7 @@ msgstr ""
 "Esta opção bloqueia esta ligação ao ponto de acesso (AP) Wi-Fi especificado "
 "pelo BSSID inserido aqui. Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3698,95 +4115,93 @@ msgstr ""
 "por nome deste ambiente, seja por endereço MAC permanente ou ambos. "
 "Exemplos: \"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Impossível carregar o ambiente de utilizador de Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Dispositivo Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Ligação Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP 40/128-bit (Hex ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase-passe WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP Dinâmico (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresarial"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Impossível carregar o ambiente de utilizador de segurança Wi-Fi; faltam "
 "definições Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Segurança Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Impossível carregar o ambiente de utilizador de segurança Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "SSID em falta"
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Segurança incompatível com o modo Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Um ficheiro de nome \"%s\" já existe."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Quer substituir %s pela ligação VPN que está a gravar?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Impossível exportar ligação VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3797,225 +4212,106 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Exportar ligação VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Destrancar"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Destrancar automaticamente este dispositivo"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informação de ligação"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Ligações de rede ativas"
+#: src/info.ui:30
+msgid "_Close"
+msgstr "_Fechar"
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Escolha o Certificado CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Chave privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Senha da chave _Privada:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Escolha o Certificado CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Certificado do _Utilizador:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"A sua ligação de banda larga móvel está configurada com as seguintes "
-"definições:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "O seu dispositivo:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "O seu fornecedor:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "O seu plano:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Uma ligação será agora estabelecida com o seu fornecedor de banda larga "
-"móvel utilizando as definições selecionadas. Se a ligação falhar ou não "
-"conseguir aceder aos recursos da rede, verifique novamente as definições. "
-"Para modificar as definições da sua ligação de banda larga móvel, escolha "
-"\"Novas ligações\" a partir do menu Sistema >> Preferências."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirme as definições da banda larga móvel"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "O meu país não está listado"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Selecione o seu plano:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Selecione o seu plano _APN (Nome do Ponto de Acesso):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Aviso: selecionar um plano incorreto pode resultar em problemas de faturação "
-"para a sua conta conta de banda larga ou pode impedir a ligação.\n"
-"\n"
-"Se não tem a certeza do seu plano por favor pergunte ao seu fornecedor o APN "
-"do seu plano."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Escolha o seu tarifário"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "O meu plano não está listado..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Selecione o seu fornecedor da _Lista:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fornecedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr ""
-"Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Fornecedor:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "O meu fornecedor utiliza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "O meu fornecedor utiliza tecnologia CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Escolha o seu fornecedor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista de países ou regiões:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "País ou região"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "O meu país não está listado"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Escolha o país ou região do seu fornecedor"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Qualquer dispositivo"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova ligação de banda larga móvel"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4023,190 +4319,270 @@ msgstr ""
 "Este assistente ajuda-o a configurar facilmente uma ligação de banda larga "
 "móvel a uma rede de telemóvel (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Precisará da seguinte informação:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "O nome do seu fornecedor de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "O nome do seu tarifário de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(em alguns casos) O APN (Nome do Ponto de Acesso) do seu tarifário de banda "
 "larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Criar uma ligação para es_Te dispositivo de banda larga móvel:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Qualquer dispositivo"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar uma ligação de banda larga móvel"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova ligação de banda larga móvel"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "País ou região"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Escolha o país ou região do seu fornecedor"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Selecione o seu fornecedor da _Lista:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "O meu fornecedor utiliza tecnologia GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "O meu fornecedor utiliza tecnologia CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Escolha o seu fornecedor"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Selecione o seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Selecione o seu plano _APN (Nome do Ponto de Acesso):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Aviso: selecionar um plano incorreto pode resultar em problemas de faturação "
+"para a sua conta conta de banda larga ou pode impedir a ligação.\n"
+"\n"
+"Se não tem a certeza do seu plano por favor pergunte ao seu fornecedor o APN "
+"do seu plano."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Escolha o seu tarifário"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"A sua ligação de banda larga móvel está configurada com as seguintes "
+"definições:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "O seu dispositivo:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "O seu fornecedor:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "O seu plano:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Uma ligação será agora estabelecida com o seu fornecedor de banda larga "
+"móvel utilizando as definições selecionadas. Se a ligação falhar ou não "
+"conseguir aceder aos recursos da rede, verifique novamente as definições. "
+"Para modificar as definições da sua ligação de banda larga móvel, escolha "
+"\"Novas ligações\" a partir do menu Sistema >> Preferências."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirme as definições da banda larga móvel"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(nenhum)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certificado C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Desconhecido"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "Selecione Um Ficheiro"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 #, fuzzy
 msgid "Cancel"
 msgstr "_Cancelar"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Selecione Um Ficheiro"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Escolha o Certificado CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Certificado do _Utilizador:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Erro ao editar ligação"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Destrancar"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Armazenar a senha só para este utilizador"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Armazenar a senha para todos os utilizadores"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Pedir a senha todas as vezes"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "A senha não é necessária"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Senha secundária:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "M_Ostrar senhas"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Senha terciária:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "M_Ostrar senhas"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Senha secundária:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Senha:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Clique para ligar"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Ou está uma senha em falta ou a ligação é inválida. No último caso, tem de "
-"editar a ligação com o nm-connection-editor primeiro."
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP Dinâmico (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_Riar"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4214,35 +4590,35 @@ msgstr ""
 "Senhas ou chaves de encriptação são necessárias para aceder à rede Wi-Fi \"%s"
 "\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação de rede Wi-Fi necessária"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação pedida pela rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Criar uma nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Insira um nome para a rede Wi-Fi que deseja criar."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ligar a uma rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4250,35 +4626,56 @@ msgstr ""
 "Insira o nome e detalhes de segurança da rede Wi-Fi oculta a que se quer "
 "ligar."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Segurança Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Ligaçã_O:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Dispositivo de rede Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Fornecedor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista de países ou regiões:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "País ou região"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Com fios"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malha OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4288,17 +4685,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ou está uma senha em falta ou a ligação é inválida. No último caso, tem de "
+"editar a ligação com o nm-connection-editor primeiro."
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Segurança Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nome da rede:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Ligaçã_O:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Dispositivo de rede Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4306,7 +4727,7 @@ msgstr ""
 "Este programa é um componente do Gestor de redes (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4314,355 +4735,347 @@ msgstr ""
 "Não está pensado para interação na linha de comandos mas sim para correr no "
 "ambiente GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "não ativo"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "não registado"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "a procurar"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registo negado"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Código PIN do cartão SIM de \"%s\" em \"%s\""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Necessário código PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "O código PIN é necessário para dispositivo de banda larga móvel"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Ligação de banda larga móvel \"%s\" ativa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Ligação %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "erro indefinido na segurança 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Não é necessá_Rio um certificado CA"
 
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr "erro não especificado ao validar o ficheiro eap-method"
-
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "ficheiro EAP-FAST PAC em falta"
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Escolha um ficheiro PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autenticado"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ambos"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identidade anóni_Ma:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_Ficheiro PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Autenticação _Interna:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir apro_Visionamento PAC automático"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "Utilizador EAP-LEAP em falta"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "Senha EAP-LEAP em falta"
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr "certificado CA EAP-PEAP inválido: %s"
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr "certificado CA EAP-PEAP inválido: sem certificado especificado"
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Escolha um certificado de Autoridade Certificadora..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versão 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Certificado C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Versão do PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "Utilizador EAP em falta"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "Senha EAP em falta"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Frase-passe WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Apresentar a frase-senha"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "Identidade EAP-TLS em falta"
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Não é necessá_Rio um certificado CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Não é necessá_Rio um certificado CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "I_Dentidade:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr "certificado CA EAP-TTLS inválido: %s"
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr "certificado CA EAP-TTLS inválido: sem certificado especificado"
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Erro desconhecido ao validar segurança 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS encapsulado"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Au_Tenticação:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "leap-username em falta"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "leap-password em falta"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "wep-key em falta"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "wep-key inválida: chave com comprimento de %zu só pode conter dígitos "
 "hexadecimais"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4670,7 +5083,7 @@ msgstr ""
 "wep-key inválida: chave com comprimento de %zu só pode conter caracteres "
 "ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4679,39 +5092,41 @@ msgstr ""
 "wep-key inválida: comprimento %zu da chave errado. A chave tem de ter um "
 "comprimento de 5/13 (ascii) ou 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "wep-key inválida: a frase-passe não pode estar vazia"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "wep-key inválida: a frase-passe tem de ter menos de 64 caracteres"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (predefinição)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistema aberto"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Chave partilhada"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (predefinição)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "C_Have:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Mos_Trar chave"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Índice _WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4720,16 +5135,106 @@ msgstr ""
 "wpa-psk inválido: comprimento inválido %zu. Tem de ser [8,63] bytes ou 64 "
 "dígitos hexadecimais"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk inválido: : impossível interpretar chave com 64 bytes como "
 "hexadecimal"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tipo:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (predefinição)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorado"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Impossível atualizar segredos da ligação devido a um desconhecido."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioridade:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "Ligar _Automaticamente a esta rede quando estiver disponível"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Informação de ligação"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Impossível importar a ligação VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "O ficheiro \"%s\" não pôde ser lido ou não contem informação de ligação "
+#~ "VPN reconhecível\n"
+#~ "\n"
+#~ "Erro: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "erro desconhecido"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Ligações de rede ativas"
+
+#~ msgid "unspecified error validating eap-method file"
+#~ msgstr "erro não especificado ao validar o ficheiro eap-method"
+
+#~ msgid "invalid EAP-PEAP CA certificate: %s"
+#~ msgstr "certificado CA EAP-PEAP inválido: %s"
+
+#~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#~ msgstr "certificado CA EAP-PEAP inválido: sem certificado especificado"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Escolha um certificado de Autoridade Certificadora..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Certificado C_A:"
+
+#~ msgid "invalid EAP-TTLS CA certificate: %s"
+#~ msgstr "certificado CA EAP-TTLS inválido: %s"
+
+#~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#~ msgstr "certificado CA EAP-TTLS inválido: sem certificado especificado"
+
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Gestor de rede"
 
@@ -4765,30 +5270,6 @@ msgstr "_Tipo:"
 #~ 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"
 
@@ -5008,18 +5489,12 @@ msgstr "_Tipo:"
 #~ msgid "IPv6 prefix \"%s\" missing"
 #~ msgstr "Prefixo \"%s\" IPv6 em falta"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Impossível carregar o ambiente de utilizador de WiMAX."
-
 #~ msgid "WiMAX name missing"
 #~ msgstr "Nome WiMAX em falta"
 
 #~ msgid "WiMAX device"
 #~ msgstr "Dispositivo WiMAX"
 
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Ligação WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5042,9 +5517,6 @@ msgstr "_Tipo:"
 #~ msgid "Error: %s"
 #~ msgstr "Erro: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Falhou a criação da ligação DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "O seu telefone encontra-se agora pronto a usar!"
 
@@ -5082,12 +5554,6 @@ msgstr "_Tipo:"
 #~ msgid "%s Network"
 #~ msgstr "Rede %s"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundário:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terciário:"
-
 #~ msgid "Only on activation"
 #~ msgstr "Apenas ao ativar"
 
@@ -5189,12 +5655,6 @@ msgstr "_Tipo:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Ligação sem fios %d"
 
-#~ msgid "_Import"
-#~ msgstr "_Importar"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Ligar _automaticamente"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "_Disponível para todos os utilizadores"
 
@@ -5246,11 +5706,6 @@ msgstr "_Tipo:"
 #~ msgid "Could not acquire the %s service. (%d)\n"
 #~ msgstr "Incapaz de obter o serviço %s (%d).\n"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Filipe Gomes <filipefgomes@gmail.com>\n"
-#~ "Duarte Loreto <happyguy_pt@hotmail.com>"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Ative Network Connections</span>"
 #~ msgstr ""
@@ -5521,9 +5976,6 @@ msgstr "_Tipo:"
 #~ msgid "Passphrase:"
 #~ msgstr "Frase-Senha:"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Apresentar a frase-senha"
-
 #~ msgid "WEP 40/128-bit Hexadecimal"
 #~ msgstr "WEP 40/128-bit Hexadecimal"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 21f8d2aa..460a240f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,9 +22,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-03-08 17:05+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-03-10 09:48-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Portuguese - Brazil <gnome-pt_br-list@gnome.org>\n"
@@ -36,7 +36,8 @@ msgstr ""
 "X-Generator: Gtranslator 3.31.90\n"
 "X-Project-Style: gnome\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rede"
 
@@ -115,7 +116,6 @@ msgstr ""
 "versão."
 
 #: org.gnome.nm-applet.gschema.xml.in:31
-#| msgid "Disable Wi-Fi Create"
 msgid "Disable WiFi Create"
 msgstr "Desabilitar criação de WiFi"
 
@@ -228,7 +228,7 @@ msgstr ""
 msgid "802.1X authentication"
 msgstr "Autenticação 802.1x"
 
-#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1107
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
 #: src/connection-editor/ce-ip4-routes.ui:30
 #: src/connection-editor/ce-ip6-routes.ui:30
 #: src/connection-editor/ce-new-connection.ui:50
@@ -465,117 +465,117 @@ msgstr "dispositivo não gerenciado"
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Conexões _VPN"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Configurar VPN…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Adicionar uma conexão VPN…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "O gerenciador de redes não está em execução…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Rede desabilitada"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Habilitar rede"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Habilitar _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Habilitar banda larga _móvel"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Habilitar n_otificações"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informações da conexão"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Editar conexões…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Sobre"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Você agora está conectado a “%s”."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "A conexão de rede foi desconectada."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Preparando conexão de rede “%s”…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Autenticação necessária pela conexão de rede “%s”…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Requisitando um endereço de rede para “%s”…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Conexão de rede “%s” está ativa"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Iniciando conexão VPN “%s”…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Autenticação necessária pela conexão VPN “%s”…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Requisitando um endereço de rede VPN para “%s”…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Conexão VPN ativa"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nenhuma conexão de rede"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicativo gerenciador de redes"
 
@@ -592,7 +592,7 @@ msgstr "Código PIN errado, por favor entre em contato com seu provedor."
 msgid "Sending unlock code…"
 msgstr "Enviando código do desbloqueio…"
 
-#: src/applet-device-broadband.c:739 src/applet-dialogs.c:501
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móvel (%s)"
@@ -713,7 +713,7 @@ msgstr "Conexão de rede ethernet “%s” ativa"
 msgid "DSL authentication"
 msgstr "Autenticação DSL"
 
-#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1108
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
 #: src/connection-editor/ce-ip4-routes.ui:44
 #: src/connection-editor/ce-ip6-routes.ui:44
 #: src/connection-editor/ce-page-dcb.ui:583
@@ -821,182 +821,188 @@ msgstr "Conexão de rede Wi-Fi “%s” ativa"
 msgid "Failed to activate connection"
 msgstr "Falha ao ativar conexão"
 
-#: src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Erro ao exibir informações de conexão:"
 
-#: src/applet-dialogs.c:73 src/connection-editor/page-wifi-security.c:378
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
 #: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
 #: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: src/applet-dialogs.c:77 src/applet-dialogs.c:239 src/applet-dialogs.c:241
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: src/applet-dialogs.c:176
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Mais endereços"
 
-#: src/applet-dialogs.c:237
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: src/applet-dialogs.c:245 src/applet-dialogs.c:254
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
 #: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/applet-dialogs.c:324 src/applet-dialogs.c:566
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: src/applet-dialogs.c:326 src/applet-dialogs.c:568
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Address
-#: src/applet-dialogs.c:341 src/applet-dialogs.c:363
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/applet-dialogs.c:342 src/applet-dialogs.c:415
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: src/applet-dialogs.c:364
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Endereço de broadcast"
 
 #. Prefix
-#: src/applet-dialogs.c:376
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/applet-dialogs.c:377
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Máscara de sub-rede"
 
-#: src/applet-dialogs.c:439
-#| msgid "_Primary"
+#: src/applet-dialogs.c:440
 msgid "Primary DNS"
 msgstr "DNS primário"
 
-#: src/applet-dialogs.c:439
-#| msgid "_Secondary Password:"
+#: src/applet-dialogs.c:440
 msgid "Secondary DNS"
 msgstr "DNS secundário"
 
-#: src/applet-dialogs.c:439
+#: src/applet-dialogs.c:440
 msgid "Tertiary DNS"
 msgstr "DNS terciário"
 
-#: src/applet-dialogs.c:487
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: src/applet-dialogs.c:490
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: src/applet-dialogs.c:497
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: src/applet-dialogs.c:499
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: src/applet-dialogs.c:507 src/applet-dialogs.c:787
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
 #: src/connection-editor/ce-page-team-port.ui:394
 #: src/connection-editor/ce-page-team.ui:775
 #: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Geral"
 
-#: src/applet-dialogs.c:510
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interface"
 
-#: src/applet-dialogs.c:525
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Endereço de hardware"
 
 #. Driver
-#: src/applet-dialogs.c:538
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: src/applet-dialogs.c:571
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Velocidade"
 
-#: src/applet-dialogs.c:584
-#| msgid "Security:"
+#: src/applet-dialogs.c:616
 msgid "Security"
 msgstr "Segurança"
 
 #. --- IPv4 ---
-#: src/applet-dialogs.c:602 src/applet-dialogs.c:817
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
 #: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: src/applet-dialogs.c:621 src/applet-dialogs.c:667
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Rota padrão"
 
-#: src/applet-dialogs.c:646 src/applet-dialogs.c:844
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
 #: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: src/applet-dialogs.c:791
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Ponto de acesso"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Senha:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tipo de VPN"
 
-#: src/applet-dialogs.c:796
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Gateway de VPN"
 
-#: src/applet-dialogs.c:800
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nome de usuário de VPN"
 
-#: src/applet-dialogs.c:804
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Mensagem VPN"
 
-#: src/applet-dialogs.c:808
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Conexão base"
 
-#: src/applet-dialogs.c:809 src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Shouldn't really happen but ...
-#: src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nenhuma conexão ativa e válida localizada!"
 
-#: src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1006,18 +1012,18 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e muitos outros contribuidores e tradutores da comunidade"
 
-#: src/applet-dialogs.c:1058
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicativo de área de notificação para gerenciamento dos seus "
 "dispositivos de rede e conexões."
 
-#: src/applet-dialogs.c:1060
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Site do Gerenciador de redes"
 
-#: src/applet-dialogs.c:1064
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Raphael Higino <In memoriam>\n"
@@ -1030,7 +1036,7 @@ msgstr ""
 "Enrico Nicoletto <liverig@gmail.com>\n"
 "Rafael Fontenelle <rafaelff@gnome.org>"
 
-#: src/applet-dialogs.c:1074
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1038,33 +1044,33 @@ msgstr ""
 "Não foi possível ao miniaplicativo Gerenciador de redes localizar alguns "
 "recursos necessários (o arquivo .ui não foi encontrado)."
 
-#: src/applet-dialogs.c:1079
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Recursos em falta"
 
-#: src/applet-dialogs.c:1105
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Senha de rede de banda larga móvel"
 
-#: src/applet-dialogs.c:1114
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Uma senha é necessária para conectar-se a “%s”."
 
-#: src/applet-dialogs.c:1129
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/applet-dialogs.c:1411
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "É necessário informar o código SIM PIN do desbloqueio"
 
-#: src/applet-dialogs.c:1412
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "É necessário informar o código SIM PIN do Desbloqueio"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: src/applet-dialogs.c:1414
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1074,25 +1080,25 @@ msgstr ""
 "ele possa ser usado."
 
 #. Translators: PIN code entry label
-#: src/applet-dialogs.c:1416
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: src/applet-dialogs.c:1420
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Exibir código PIN"
 
-#: src/applet-dialogs.c:1422
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "É necessário informar o código SIM PUK de desbloqueio"
 
-#: src/applet-dialogs.c:1423
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "É necessário informar o código SIM PUK de Desbloqueio"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: src/applet-dialogs.c:1425
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1102,35 +1108,35 @@ msgstr ""
 "possa ser usado."
 
 #. Translators: PUK code entry label
-#: src/applet-dialogs.c:1427
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: src/applet-dialogs.c:1430
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Novo código PIN:"
 
 #. Translators: New PIN verification entry label
-#: src/applet-dialogs.c:1432
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Re-inserir o novo código PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: src/applet-dialogs.c:1437
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "A conexão tinha nenhuma configuração VPN"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Falha ao escrever conexão com a interface do usuário VPN: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Falha ao escrever conexão com a interface do usuário VPN: escrita incompleta"
@@ -3060,10 +3066,6 @@ msgstr "B/G (2.4 GHz)"
 msgid "Client"
 msgstr "Cliente"
 
-#: src/connection-editor/ce-page-wifi.ui:52
-msgid "Hotspot"
-msgstr "Ponto de acesso"
-
 #: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
@@ -3928,12 +3930,12 @@ msgstr "Meu provedor usa tecnologia _GSM (ex.: 3G, GPRS, EDGE, UMTS, HSDPA)"
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Meu provedor usa tecnologias baseadas em C_DMA (ex.: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4208,6 +4210,10 @@ msgstr "Informações da conexão"
 msgid "_Close"
 msgstr "_Fechar"
 
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
 #: src/libnma/nma-file-cert-chooser.c:108
 #: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
@@ -4251,32 +4257,28 @@ msgstr "_Certificado de %s"
 msgid "My country is not listed"
 msgstr "Meu país não está listado"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Meu plano não está listado…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provedor"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Países ou regiões"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Qualquer dispositivo"
 
@@ -4309,23 +4311,24 @@ msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(em alguns casos) O APN (Nome do Ponto de Acesso) do seu plano de banda larga"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "_Criar uma conexão para este dispositivo móvel:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configurar uma conexão de banda larga móvel"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista de países ou regiões:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Países ou regiões"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Escolha o país ou região do seu provedor"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Escolha seu provedor a partir de uma _lista:"
 
@@ -4601,6 +4604,14 @@ msgstr "Não localizei _meu provedor e quero digitá-lo manualmente:"
 msgid "Provider:"
 msgstr "Provedor:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista de países ou regiões:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Países ou regiões"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Com fio"
diff --git a/po/ro.po b/po/ro.po
index d77ef0d3..57241a6d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Network"
-"Manager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-05-04 14:44+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2016-05-04 21:50+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -23,49 +23,58 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-08-15 10:41+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3097
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Rețea"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Gestionează conexiunile la rețea"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Conexiuni de rețea"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Conexiuni de rețea active"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Gestionează și modifică opțiunile conexiunilor de rețea"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Dezactivează notificările de conectare"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva notificările ce apar la conectarea la "
 "o rețea."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Dezactivează notificările de deconectare"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
 "de la o rețea."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Dezactivează notificările VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -73,53 +82,54 @@ msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
 "de la un VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Suprimă notificările pentru rețele disponibile"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva notificările pentru rețelele fără fir "
 "disponibile."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Ștampilă"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Folosit pentru a determina dacă configurările ar trebui migrate la o nouă "
 "versiune."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Dezactivare creare Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva crearea de rețele ad-hoc când se "
 "folosește miniaplicația."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Arată miniaplicația în zona de notificări"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Definiți ca „FALSE” pentru a dezactiva afișarea miniaplicației în zona de "
 "notificări."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignoră certificatul CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -127,7 +137,7 @@ msgstr ""
 "Definiți aceasta ca „TRUE” pentru a dezactiva avertismentele despre "
 "certificatele CA în autentificarea EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -135,16 +145,15 @@ msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva avertizările despre certificatele CA "
 "în faza a 2-a a autentificării EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Administrator de rețea"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
-#| msgid "No network connection"
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Editorul de conexiuni „Administrator de rețea”"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -152,7 +161,7 @@ msgstr ""
 "Administrator de rețea este un serviciu de sistem pentru gestionarea și "
 "configurarea conexiunilor de rețea și dispozitivelor."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -160,185 +169,214 @@ msgstr ""
 "Programul nm-connection-editor funcționează cu Administrator de rețea pentru "
 "a creea și edita profile de conexiune pentru Administrator de rețea."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
-#| msgid "NetworkManager Applet"
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Dezvoltatorii Administrator de rețea"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: shared/nm-utils/nm-shared-utils.c:794
+#, c-format
+msgid "object class '%s' has no property named '%s'"
+msgstr ""
+
+#: shared/nm-utils/nm-shared-utils.c:801
+#, c-format
+msgid "property '%s' of object class '%s' is not writable"
+msgstr ""
+
+#: shared/nm-utils/nm-shared-utils.c:808
+#, c-format
+msgid ""
+"construct property \"%s\" for object '%s' can't be set after construction"
+msgstr ""
+
+#: shared/nm-utils/nm-shared-utils.c:816
+#, 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:825
+#, c-format
+msgid "unable to set property '%s' of type '%s' from value of type '%s'"
+msgstr ""
+
+#: shared/nm-utils/nm-shared-utils.c:836
+#, c-format
+msgid ""
+"value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
+"type '%s'"
+msgstr ""
+
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autentificare 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-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/gsm-unlock.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Anulează"
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Nume rețea:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sigur."
 
-#: ../src/applet.c:345
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Eșec la adăugarea/activarea conexiunii"
 
-#: ../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.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
-#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
-#: ../src/applet-device-wifi.c:1470
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Conexiune eșuată"
 
-#: ../src/applet.c:399
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Deconectarea dispozitivului a eșuat"
 
-#: ../src/applet.c:404
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Eșec la deconectare"
 
-#: ../src/applet.c:434
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Activarea conexiunii a eșuat"
 
-#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
-msgid "Don't show this message again"
+#: src/applet.c:808 src/applet-device-wifi.c:1127
+#, fuzzy
+msgid "Don’t show this message again"
 msgstr "Nu arăta din nou acest mesaj"
 
-#: ../src/applet.c:844
-#, c-format
+#: src/applet.c:898
+#, fuzzy, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was "
+"The VPN connection “%s” disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Conexiunea VPN „%s” a fost deconectată deoarece conexiunea la rețea a fost "
+"întreruptă."
+
+#: src/applet.c:900
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection “%s” failed because the network connection was "
 "interrupted."
 msgstr ""
 "\n"
 "Conexiunea VPN „%s” a eșuat deoarece conexiunea la rețea a fost întreruptă."
 
-#: ../src/applet.c:847
-#, c-format
+#: src/applet.c:902
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece serviciul VPN s-a oprit brusc."
 
-#: ../src/applet.c:850
-#, c-format
+#: src/applet.c:904
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a returnat o configurare "
 "nevalidă."
 
-#: ../src/applet.c:853
-#, c-format
+#: src/applet.c:906
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece încercarea de conectare a expirat."
 
-#: ../src/applet.c:856
-#, c-format
+#: src/applet.c:908
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece serviciul VPN nu a pornit în timp util."
 
-#: ../src/applet.c:859
-#, c-format
+#: src/applet.c:910
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a eșuat la pornire."
 
-#: ../src/applet.c:862
-#, c-format
+#: src/applet.c:912
+#, fuzzy, c-format
 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"
 "Conexiunea VPN „%s” a eșuat deoarece nu există secrete VPN valide."
 
-#: ../src/applet.c:865
-#, c-format
+#: src/applet.c:914
+#, fuzzy, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 "\n"
 "Conexiunea VPN „%s” a eșuat datorită unor secrete VPN nevalide."
 
-#: ../src/applet.c:872
-#, c-format
+#: src/applet.c:919
+#, fuzzy, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed."
+"The VPN connection “%s” failed."
 msgstr ""
 "\n"
 "Conexiunea VPN „%s” a eșuat."
 
-#: ../src/applet.c:888
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată deoarece conexiunea la rețea a fost "
-"întreruptă."
-
-#: ../src/applet.c:891
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată deoarece serviciul VPN a fost oprit."
-
-#: ../src/applet.c:897
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
-msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată."
-
-#: ../src/applet.c:927
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -349,23 +387,23 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:929
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Conexiunea VPN a fost stabilită cu succes.\n"
 
-#: ../src/applet.c:931
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Mesaj de autentificare VPN"
 
-#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Conexiunea VPN a eșuat"
 
-#: ../src/applet.c:990
-#, c-format
+#: src/applet.c:1002
+#, fuzzy, c-format
 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 ""
@@ -374,11 +412,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:993
-#, c-format
+#: src/applet.c:1005
+#, fuzzy, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed to start.\n"
+"The VPN connection “%s” failed to start.\n"
 "\n"
 "%s"
 msgstr ""
@@ -387,553 +425,592 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1284
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "dispozitivul nu este pregătit (lipsește firmware-ul)"
 
-#: ../src/applet.c:1286
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "dispozitiv nepregătit"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1296 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "deconectat"
 
-#: ../src/applet.c:1312
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Deconectează"
 
-#: ../src/applet.c:1326
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "dispozitiv neadministrat"
 
-#: ../src/applet.c:1399
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nu există dispozitive de rețea disponibile"
 
-#: ../src/applet.c:1453
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Conexiuni _VPN"
 
-#: ../src/applet.c:1497
-msgid "_Configure VPN..."
+#: src/applet.c:1507
+#, fuzzy
+msgid "_Configure VPN…"
 msgstr "_Configurează VPN..."
 
-#: ../src/applet.c:1500
-#| msgid "Export VPN connection..."
-msgid "_Add a VPN connection..."
+#: src/applet.c:1510
+#, fuzzy
+msgid "_Add a VPN connection…"
 msgstr "_Adaugă o conexiune VPN..."
 
-#: ../src/applet.c:1606
-msgid "NetworkManager is not running..."
+#: src/applet.c:1616
+#, fuzzy
+msgid "NetworkManager is not running…"
 msgstr "Administrator de rețea nu este pornit..."
 
-#: ../src/applet.c:1611 ../src/applet.c:2603
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Rețea dezactivată"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1821
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Activează _rețeaua"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1830
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Activează _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1839
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Activează Internetul _mobil de bandă largă"
 
 #. Toggle notifications item
-#: ../src/applet.c:1851
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Activează n_otificările"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1863
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Detal_ii conexiune"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1871
-msgid "Edit Connections..."
+#: src/applet.c:1881
+#, fuzzy
+msgid "Edit Connections…"
 msgstr "Editează conexiuni..."
 
-#: ../src/applet.c:1885
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Despre"
 
-#: ../src/applet.c:2170
-#, c-format
-msgid "You are now connected to '%s'."
+#: src/applet.c:2206
+#, fuzzy, c-format
+msgid "You are now connected to “%s”."
 msgstr "V-ați conectat la „%s”."
 
-#: ../src/applet.c:2213
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Deconectat"
 
-#: ../src/applet.c:2214
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Conexiunea la rețea a fost deconectată."
 
-#: ../src/applet.c:2465
-#, c-format
-msgid "Preparing network connection '%s'..."
+#: src/applet.c:2549
+#, fuzzy, c-format
+msgid "Preparing network connection “%s”…"
 msgstr "Se pregătește conexiunea la rețeaua „%s”..."
 
-#: ../src/applet.c:2468
-#, c-format
-msgid "User authentication required for network connection '%s'..."
+#: src/applet.c:2552
+#, fuzzy, c-format
+msgid "User authentication required for network connection “%s”…"
 msgstr ""
 "Se cere autentificarea utilizatorului pentru conexiunea la rețeaua „%s”..."
 
-#: ../src/applet.c:2471 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
-#, c-format
-msgid "Requesting a network address for '%s'..."
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#, fuzzy, c-format
+msgid "Requesting a network address for “%s”…"
 msgstr "Se cere o adresă de rețea pentru „%s”..."
 
-#: ../src/applet.c:2474
-#, c-format
-msgid "Network connection '%s' active"
+#: src/applet.c:2558
+#, fuzzy, c-format
+msgid "Network connection “%s” active"
 msgstr "Conexiune activă la rețeaua „%s”"
 
-#: ../src/applet.c:2548
-#, c-format
-msgid "Starting VPN connection '%s'..."
+#: src/applet.c:2631
+#, fuzzy, c-format
+msgid "Starting VPN connection “%s”…"
 msgstr "Se pornește conexiunea VPN „%s”..."
 
-#: ../src/applet.c:2551
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
+#: src/applet.c:2634
+#, fuzzy, c-format
+msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 "Autentificarea utilizatorului este necesară pentru conexiunea VPN „%s”..."
 
-#: ../src/applet.c:2554
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
+#: src/applet.c:2637
+#, fuzzy, c-format
+msgid "Requesting a VPN address for “%s”…"
 msgstr "Se cere o adresă VPN pentru „%s”..."
 
-#: ../src/applet.c:2557
-#, c-format
-#| msgid "VPN connection '%s' active"
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Conexiunea VPN este activă"
 
-#: ../src/applet.c:2607
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nu există conexiuni la rețea"
 
-#: ../src/applet.c:3196
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniaplicație Administrator de rețea"
 
-#: ../src/applet-device-broadband.c:159
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Cod PUK greșit, contactați furnizorul dumneavoastră."
 
-#: ../src/applet-device-broadband.c:201
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Cod PIN greșit, contactați furnizorul dumneavoastră."
 
 #. 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
+#, fuzzy
+msgid "Sending unlock code…"
 msgstr "Se trimite codul de deblocare..."
 
-#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Internet mobil de bandă largă (%s)"
 
-#: ../src/applet-device-broadband.c:736
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Internet mobil de bandă largă"
 
-#: ../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:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Disponibile"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:801
-msgid "New Mobile Broadband connection..."
-msgstr "Conexiune nouă de Internet mobil de bandă largă..."
+#: src/applet-device-broadband.c:807
+#, fuzzy
+msgid "New Mobile Broadband connection…"
+msgstr "Conexiune nouă de Internet mobil de bandă largă"
 
-#: ../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:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Conexiune stabilită"
 
-#: ../src/applet-device-broadband.c:816
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "V-ați conectat la rețeaua de Internet mobil de bandă largă."
 
-#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Rețea mobilă de bandă largă."
 
-#: ../src/applet-device-broadband.c:957
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Sunteți înregistrat la rețeaua de acasă."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Sunteți înregistrat pe o rețea de tip roaming."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "V-ați conectat la rețeaua de Internet mobil de bandă largă."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
+#, fuzzy, c-format
+msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Se pregătește conexiunea la Internet mobil de bandă largă „%s”..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
+#, fuzzy, c-format
+msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Se configurează conexiunea la Internet mobil de bandă largă „%s”..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
-#, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
+#, fuzzy, c-format
+msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Este necesară autentificarea utilizatorului pentru conexiunea la Internet "
 "mobil de bandă largă „%s”..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
-#, c-format
-msgid "Mobile broadband connection '%s' active"
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
+#, fuzzy, c-format
+msgid "Mobile broadband connection “%s” active"
 msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automat"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Rețele cu fir (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rețea cu fir (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Rețele cu fir"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rețea cu fir"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "V-ați conectat la rețeaua cu fir."
 
-#: ../src/applet-device-ethernet.c:161
-#, c-format
-msgid "Preparing ethernet network connection '%s'..."
+#: src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection “%s”…"
 msgstr "Se pregătește conexiunea la rețeaua cu fir „%s”..."
 
-#: ../src/applet-device-ethernet.c:164
-#, c-format
-msgid "Configuring ethernet network connection '%s'..."
+#: src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection “%s”…"
 msgstr "Se configurează conexiunea la rețeaua cu fir „%s”..."
 
-#: ../src/applet-device-ethernet.c:167
-#, c-format
-msgid "User authentication required for ethernet network connection '%s'..."
+#: src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Este necesară autentificarea utilizatorului pentru conexiunea la rețeaua cu "
 "fir „%s”..."
 
-#: ../src/applet-device-ethernet.c:170
-#, c-format
-msgid "Requesting an ethernet network address for '%s'..."
+#: src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Se cere o adresă de rețea cu fir pentru „%s”..."
 
-#: ../src/applet-device-ethernet.c:174
-#, c-format
-msgid "Ethernet network connection '%s' active"
+#: src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection “%s” active"
 msgstr "Conexiunea „%s” la rețeaua cu fir activă"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autentificare DSL"
 
-#: ../src/applet-device-wifi.c:230
-msgid "_Connect to Hidden Wi-Fi Network..."
-msgstr "_Conectează la o rețea fără fir ascunsă..."
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "_OK"
 
-#: ../src/applet-device-wifi.c:281
-msgid "Create _New Wi-Fi Network..."
-msgstr "Creează rețea fără fir _nouă..."
+#: src/applet-device-wifi.c:225
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network…"
+msgstr "Conectare la rețea fără fir ascunsă"
 
-#: ../src/applet-device-wifi.c:431
+#: src/applet-device-wifi.c:276
+#, fuzzy
+msgid "Create _New Wi-Fi Network…"
+msgstr "Creează rețea fără fir nouă"
+
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(nici una)"
 
-#: ../src/applet-device-wifi.c:901
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
+msgid "Failed to add new connection"
+msgstr "Eșec la adăugarea noii conexiuni"
+
+#: src/applet-device-wifi.c:537
+msgid "Insufficient privileges."
+msgstr ""
+
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Rețele fără fir (%s)"
 
-#: ../src/applet-device-wifi.c:903
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rețea fără fir (%s)"
 
-#: ../src/applet-device-wifi.c:905
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rețea cu fir"
 msgstr[1] "Rețele cu fir"
 msgstr[2] "Rețele cu fir"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi este dezactivat"
 
-#: ../src/applet-device-wifi.c:935
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi este dezactivat de la un comutator hardware"
 
-#: ../src/applet-device-wifi.c:996
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Mai multe rețele"
 
-#: ../src/applet-device-wifi.c:1180
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Rețele fără fir disponibile"
 
-#: ../src/applet-device-wifi.c:1181
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Utilizați meniul de rețea pentru a vă conecta la o rețea fără fir"
 
-#: ../src/applet-device-wifi.c:1364
-#, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
+#: src/applet-device-wifi.c:1308
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "V-ați conectat la rețeaua fără fir „%s”."
 
-#: ../src/applet-device-wifi.c:1399
-#, c-format
-msgid "Preparing Wi-Fi network connection '%s'..."
+#: src/applet-device-wifi.c:1343
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Se pregătește conexiunea la rețeaua fără fir „%s”..."
 
-#: ../src/applet-device-wifi.c:1402
-#, c-format
-msgid "Configuring Wi-Fi network connection '%s'..."
+#: src/applet-device-wifi.c:1346
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Se configurează conexiunea la rețeaua fără fir „%s”..."
 
-#: ../src/applet-device-wifi.c:1405
-#, c-format
-msgid "User authentication required for Wi-Fi network '%s'..."
+#: src/applet-device-wifi.c:1349
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Este necesară autentificarea utilizatorului pentru rețeaua fără fir „%s”..."
 
-#: ../src/applet-device-wifi.c:1408
-#, c-format
-msgid "Requesting a Wi-Fi network address for '%s'..."
+#: src/applet-device-wifi.c:1352
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Se cere o adresă de rețea fără fir pentru „%s”..."
 
-#: ../src/applet-device-wifi.c:1419
-#, c-format
-msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+#: src/applet-device-wifi.c:1363
+#, fuzzy, c-format
+msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Conexiune activă la rețeaua fără fir „%s”: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1423
-#, c-format
-msgid "Wi-Fi network connection '%s' active"
+#: src/applet-device-wifi.c:1367
+#, fuzzy, c-format
+msgid "Wi-Fi network connection “%s” active"
 msgstr "Conexiunea „%s” activă la rețeaua cu fir"
 
-#: ../src/applet-device-wifi.c:1442
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Eșec la activarea conexiunii"
 
-#: ../src/applet-device-wifi.c:1465
-msgid "Failed to add new connection"
-msgstr "Eșec la adăugarea noii conexiuni"
-
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Eroare la afișarea informațiilor despre conexiune:"
 
-#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP Dinamic"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Mai multe adrese"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:283
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Niciuna"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (implicită)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Necunoscută"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Necunoscută"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adresă IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresă broadcast"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Necunoscută"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mască subrețea"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primar:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS secundar:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS terțiar:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../src/connection-editor/page-general.c:347
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Interfață"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Adresă fizică"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Driver"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Viteză"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Securitate:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Rută implicită"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Ignorat"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Parolă:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Tip VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Gateway VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Nume utilizator VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Baner VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Conexiune de bază"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Necunoscută"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nu s-au găsit conexiuni active valide!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -941,177 +1018,196 @@ msgstr ""
 "Drepturi de autor © 2005-2008 Novell, Inc.\n"
 "și mulți alți contribuitori și traducători din comunitate"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicație din zona de notificare pentru administrarea dispozitivelor și "
 "conexiunilor la rețea."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Situl web pentru Administrator de rețea"
 
-#: ../src/applet-dialogs.c:1005
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Adi Roiban https://launchpad.net/~adiroiban\n"
+"  Alex Bernea https://launchpad.net/~alex-bernea\n"
+"  Alexandru Cucu https://launchpad.net/~alexandru.cucu\n"
+"  Claudia Cotună https://launchpad.net/~special4ti\n"
+"  Cosmin https://launchpad.net/~cosminonofre\n"
+"  Ionuț Jula https://launchpad.net/~ionutjula\n"
+"  Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu"
+
+#: src/applet-dialogs.c:1161
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Miniaplicația NetworkManager nu a putut găsi unele resurse (nu s-a putut "
+"găsi fișierul .ui)."
+
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Resurse lipsă"
 
-#: ../src/applet-dialogs.c:1030
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Parola pentru Internetul mobil de bandă largă"
 
-#: ../src/applet-dialogs.c:1039
-#, c-format
-msgid "A password is required to connect to '%s'."
+#: src/applet-dialogs.c:1201
+#, fuzzy, c-format
+msgid "A password is required to connect to “%s”."
 msgstr "Este necesară o parolă pentru conectarea la „%s”."
 
-#: ../src/applet-dialogs.c:1054
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../src/applet-dialogs.c:1336
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Deblocare PIN SIM necesară"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Deblocare PIN SIM necesară"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1339
-#, c-format
+#: src/applet-dialogs.c:1501
+#, fuzzy, c-format
 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 ""
 "Dispozitivul de acces la Internet mobil de bandă largă „%s” necesită un cod "
 "PIN SIM înainte de a putea fi utilizat."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1341
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Cod PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1345
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Arată codul PIN"
 
-#: ../src/applet-dialogs.c:1347
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Deblocare PUK SIM necesară"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Deblocare PUK SIM necesară"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1350
-#, c-format
+#: src/applet-dialogs.c:1512
+#, fuzzy, c-format
 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 ""
 "Dispozitivul de acces la Internet mobil de bandă largă „%s” necesită un cod "
 "PUK SIM înainte de a putea fi utilizat."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1352
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Cod PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1355
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Cod PIN nou:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1357
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Reintroduceți noul cod PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1362
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Arată codurile 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-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Detalii conexiune"
 
-#: ../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/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Nu s-a putut crea conexiunea DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
+#, fuzzy
 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 ""
 "Adresele IP identifică calculatorul pe Internet. Apăsați pe butonul „Adaugă” "
 "pentru a adăuga o nouă adresă IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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/nm-connection-editor.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Adaugă"
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "Șter_ge"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_noră rutele obținute automat"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Folosește conexi_unea doar pentru resursele din rețeaua acesteia"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "La activare, această conexiune nu va fi folosită niciodată ca una implicită."
 
-#: ../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
-msgid "Create…"
+#: src/connection-editor/ce-new-connection.ui:65
+#, fuzzy
+msgid "C_reate…"
 msgstr "Creează…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Alegeți un tip de conexiune"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:5
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1123,82 +1219,100 @@ msgstr ""
 "Dacă creați un VPN, și conexiunea VPN pe care doriți să o creați nu apare în "
 "listă, probabil că nu aveți acel modul VPN instalat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Serviciu:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Copie de siguranță activă"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (recomandat)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Conexiuni cu fir:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "M_od:"
 
-#. 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-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Editează"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Frecvența de monitorizare:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Nume _interfață:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Monitorizarea _legăturii:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "Țin_te ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1206,19 +1320,20 @@ msgstr ""
 "O adresă IP, sau o listă separată prin virgulă de adrese IP, de căutat când "
 "se verifică starea legăturii."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primar:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1226,549 +1341,843 @@ msgstr ""
 "Numele interfeței dispozitivului primar. Dacă este configurat, dispozitivul "
 "va fi întotdeauna sclavul activ când este disponibil."
 
-#: ../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-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "octeți"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prioritate:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
+msgstr "_Conexiuni cu fir:"
+
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Vârsta _maximă:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automat"
 
-#: ../src/connection-editor/ce-page.c:86
-#: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:168
-#: ../src/connection-editor/page-wifi.c:172
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "implicit"
 
-#: ../src/connection-editor/ce-page.c:132
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "eroare nespecificată"
 
-#: ../src/connection-editor/ce-page.c:245
+#: src/connection-editor/ce-page.c:294
+msgid "Preserve"
+msgstr ""
+
+#: src/connection-editor/ce-page.c:295
+msgid "Permanent"
+msgstr ""
+
+#: src/connection-editor/ce-page.c:296
+msgid "Random"
+msgstr ""
+
+#: src/connection-editor/ce-page.c:297
+#, fuzzy
+msgid "Stable"
+msgstr "Activează"
+
+#: src/connection-editor/ce-page.c:301
+#, fuzzy
+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 ""
+"Adresa MAC introdusă aici va fi folosită ca adresă hardware pentru "
+"dispozitivul de rețea pe care este activată această conexiune. Această "
+"caracteristică este cunoscută sub numele de clonare sau falsificare MAC. "
+"Exemplu: 00:11:22:33:44:55"
+
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "Adresă MAC"
 
-#: ../src/connection-editor/ce-page.c:245
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Adresă fizică"
 
-#: ../src/connection-editor/ce-page.c:248
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "nevalid %s pentru %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:252
-#: ../src/connection-editor/ce-page.c:484
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "nevalid %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:268
-#, c-format
-msgid "invalid interface-name for %s (%s)"
+#: src/connection-editor/ce-page.c:388
+#, fuzzy, c-format
+msgid "invalid interface-name for %s (%s): "
 msgstr "nume de interfață nevalid pentru %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
-#, c-format
-msgid "invalid interface-name (%s)"
+#: src/connection-editor/ce-page.c:392
+#, fuzzy, c-format
+msgid "invalid interface-name (%s): "
 msgstr "nume de interfață nevalid (%s)"
 
-#: ../src/connection-editor/ce-page.c:485
+#: src/connection-editor/ce-page.c:571
+msgid "can’t parse device name"
+msgstr ""
+
+#: src/connection-editor/ce-page.c:589
+#, fuzzy
+msgid "invalid hardware address"
+msgstr "Adresă fizică"
+
+#: src/connection-editor/ce-page.c:611
+#, fuzzy, c-format
+msgid "invalid %s (%s): "
+msgstr "nevalid %s (%s)"
+
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "dispozitiv"
 
-#: ../src/connection-editor/ce-page.c:591
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Eșec în actualizarea secretelor conexiunii din cauza unei erori necunoscute."
+#: src/connection-editor/ce-page.c:616
+#, fuzzy, c-format
+msgid "invalid %s (%s) "
+msgstr "nevalid %s (%s)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
-msgid "Use Data Center Bridging (DCB) for this connection"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:16
+#, fuzzy
+msgid "_Use Data Center Bridging (DCB) for this connection"
+msgstr "Folosește securitatea 802.1X pentru această conexiune"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funcționalitate"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Activează"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritate"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
-msgid "Options..."
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
+#, fuzzy
+msgid "Options…"
 msgstr "Opțiuni..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grupuri de prioritate"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
+msgid "Fabric"
+msgstr ""
+
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
+msgid "VN2VN"
+msgstr "VN2VN"
+
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
+msgid "Priority Flow Control"
+msgstr ""
+
+#: src/connection-editor/ce-page-dcb.ui:613
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:18
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "Fabric"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "VN2VN"
-msgstr "VN2VN"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "Priority Flow Control"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "Enable or disable priority pause transmission for each User Priority."
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "Priority:"
-msgstr "Prioritate:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
-msgid "Traffic Class:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
-msgid "Strict Bandwidth:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
-msgid "Priority Bandwidth:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
+msgstr "Prioritate"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:42
-msgid "15"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 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 ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:47
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:48
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "Nume _utilizator:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Serviciu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/eap-method-tls.ui.h:7
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Afișea_ză parola"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Parolă:"
 
-#: ../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-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/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Interfață"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Interfață:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Interfață:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automat"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:60
+msgid "Half"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
-msgid "_Speed:"
-msgstr "_Viteză:"
+#: src/connection-editor/ce-page-ethernet.ui:63
+msgid "Full"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
+msgid "Ignore"
+msgstr "Ignoră"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "Aut_onegociere"
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
+msgid "Manual"
+msgstr "Manual"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Serviciu:"
+msgid "_Port"
+msgstr "_Port:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Adresa MAC _clonată:"
 
-#: ../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 ""
-"Adresa MAC introdusă aici va fi folosită ca adresă hardware pentru "
-"dispozitivul de rețea pe care este activată această conexiune. Această "
-"caracteristică este cunoscută sub numele de clonare sau falsificare MAC. "
-"Exemplu: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Parola pentru cheia _privată:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Implicit"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ignoră"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Adresă broadcast:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Parola pentru cheia _privată:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:428
+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:448
+#, fuzzy
+msgid "_Speed"
+msgstr "_Viteză:"
+
+#: src/connection-editor/ce-page-ethernet.ui:462
+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:482
+#, fuzzy
+msgid "Duple_x"
+msgstr "Full duple_x"
+
+#: src/connection-editor/ce-page-ethernet.ui:496
+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:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Niciuna"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "V-ați conectat la rețeaua cu fir."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Firewall _zone:"
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Co_nexiune:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Conectează _automat"
+
+#: src/connection-editor/ce-page-general.ui:167
+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.h:109
+#, fuzzy
+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 ""
+"Adresele IP identifică calculatorul pe Internet. Apăsați pe butonul „Adaugă” "
+"pentru a adăuga o nouă adresă IP."
+
+#: src/connection-editor/ce-page.h:114
+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:119
+#, fuzzy
+msgid "Additional static addresses"
+msgstr "Automat, doar adresele"
+
+#: src/connection-editor/ce-page.h:120
+msgid "Addresses"
+msgstr "Adrese"
+
+#: src/connection-editor/ce-page.h:121
+msgid "Address (optional)"
 msgstr ""
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "C_onectare"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
+msgid "IPIP"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
+msgid "GRE"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
+msgid "SIT"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
+msgid "ISATAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
+msgid "VTI"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
+msgid "IP6IP6"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
+msgid "IPIP6"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
+msgid "IP6GRE"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
+msgid "VTI6"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
+msgstr "_Serviciu:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
+msgstr "Ethernet (%s)"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+msgid "Mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+msgid "Local IP"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+msgid "Remote IP"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+msgid "Input key"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+msgid "Output key"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
+#, fuzzy
+msgid "MTU"
+msgstr "_MTU:"
+
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automate cu configurări DNS manuale"
 
-#: ../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 "Manual"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Doar legătură 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/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Partajată cu alte calculatoare"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metodă:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "Addresses"
-msgstr "Adrese"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:202
+#, fuzzy
 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 ""
 "Identificatorul de client DHCP permite administratorului de rețea să "
 "personalizeze configurația calculatorului dumneavoastră. Dacă doriți să "
 "folosiți un identificator de client DHCP, introduceți-l aici."
 
-#: ../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:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1776,26 +2185,26 @@ msgstr ""
 "Domenii folosite la rezolvarea numelor calculatoarelor. Folosiți virgule "
 "pentru a separa mai multe domenii."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID client 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:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "Domenii de cău_tare:"
 
-#: ../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
-msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Servere _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1804,12 +2213,12 @@ msgstr ""
 "calculatoarelor. Folosiți virgule pentru a separa mai multe servere de "
 "domenii."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Necesită adresare IPv4 pentru a completa această conexiune"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1818,25 +2227,34 @@ msgstr ""
 "conexiunii în cazul în care nu se poate configura IPv4, dar configurația "
 "IPv6 reușește."
 
-#: ../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:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rute…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:196
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Dezactivat"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1847,16 +2265,20 @@ msgstr ""
 "calculatoarelor. Folosiți virgule pentru a separa mai multe servere de "
 "domenii."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Necesită adresare IPv6 pentru a completa această conexiune"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1865,346 +2287,954 @@ msgstr ""
 "conexiunii în cazul în care nu se poate configura IPv6, dar configurația "
 "IPv4 reușește."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metrică"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Importă"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "De bază"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "Nu_măr:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avansat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID r_ețea:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "Change..."
+#: src/connection-editor/ce-page-mobile.ui:221
+#, fuzzy
+msgid "Change…"
 msgstr "Modifică..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Permite roamingul dacă rețeaua de domiciliu nu este disponibilă"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Afișea_ză parolele"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Metode permise:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Configurare _metode…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Compresie"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Folosește criptare p_unct-la-punct (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Necesită cripta_re pe 128 de biți"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Folosește MPPE cu _stare"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Permite compresia _BSD a datelor"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Permite compresia _Deflate a datelor"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Folosește compresia antete_lor TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Trimite pachete _echo PPP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:2
-msgid "_JSON config:"
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
+#, fuzzy
+msgid "None"
+msgstr "Niciuna"
+
+#: src/connection-editor/ce-page-proxy.ui:34
+msgid "For browser only"
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:38
+msgid "Use this proxy configuration for only browser clients/schemes."
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:86
+msgid "Import script from a file…"
+msgstr ""
+
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Metodă:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
+#, fuzzy
+msgid "Ad_vanced…"
+msgstr "Avansat"
+
+#: src/connection-editor/ce-page-team-port.ui:108
+msgid "Set by master"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
+#, fuzzy
+msgid "Ethernet port state"
+msgstr "Rețele cu fir"
+
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
+msgid "ARP (IPv4)"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
+msgid "NDP (IPv6)"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
+msgid "Team Advanced Options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
+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:241
+msgid "ID of queue which this port should be mapped to."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prioritate:"
+
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
+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:286
+msgid "Port priority. The higher number means higher priority."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
+msgstr "_Prioritate:"
+
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
+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:361
+msgid ""
+"Port priority according to LACP standard. The lower number means higher "
+"priority."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
+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:376
+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:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+msgid "Send _interval"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+msgid "Delay _before first send"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+msgid "_Maximum missed replies"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
+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:548
+#: src/connection-editor/ce-page-team.ui:1274
+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:560
+#: src/connection-editor/ce-page-team.ui:1286
+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:570
+#: src/connection-editor/ce-page-team.ui:1296
+msgid "Ignore invalid packets from _active ports"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
+msgid "Ignore invalid packets from i_nactive ports"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
+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:604
+#: src/connection-editor/ce-page-team.ui:1330
+msgid "S_end on inactive ports"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
+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:2
-msgid "_Import team configuration from a file..."
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
+msgid ""
+"The delay between the link coming up and the runner being notified about it."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
+msgid ""
+"The delay between the link going down and the runner being notified about it."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
+msgid "The interval between requests being sent."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
+msgid ""
+"The delay between link watch initialization and the first request being sent."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
+msgid "The link watcher to be used."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
+msgid "Link Watcher"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
+msgid "Im_port team configuration from a file…"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
+msgid "Raw Configuration"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:15
+msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:19
+msgid "Highest priority (stable)"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:23
+msgid "Bandwidth"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:27
+msgid "Highest number of ports"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:31
+#, fuzzy
+msgid "Port priority"
+msgstr "Prioritate"
+
+#: src/connection-editor/ce-page-team.ui:57
+#, fuzzy
+msgid "From the team device"
+msgstr "Ethernet (%s)"
+
+#: src/connection-editor/ce-page-team.ui:61
+msgid "From the active port"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:65
+msgid "From active to team device"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Co_nexiune:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "Im_port team configuration from a file..."
+#: src/connection-editor/ce-page-team.ui:441
+msgid "Load balance"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:445
+msgid "LACP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
-msgid "_Parent interface:"
-msgstr "Interfață:"
+msgid "Ethernet"
+msgstr "Ethernet automat"
+
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:500
+#, fuzzy
+msgid "IP"
+msgstr "FIP"
+
+#: src/connection-editor/ce-page-team.ui:504
+msgid "Any L3 protocol"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:508
+#, fuzzy
+msgid "TCP"
+msgstr "GTC"
+
+#: src/connection-editor/ce-page-team.ui:512
+msgid "UDP"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:516
+msgid "SCTP"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:520
+msgid "Any L4 protocol"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
+msgstr "Adresă fizică"
+
+#: src/connection-editor/ce-page-team.ui:752
+msgid ""
+"Desired hardware address of new team device. Usual MAC address format is "
+"accepted."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "_Hardware address policy"
+msgstr "Adresă fizică"
+
+#: src/connection-editor/ce-page-team.ui:827
+msgid "Name of runner to be used."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:848
+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:866
+msgid "Send LACPDU frames _periodically"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:870
+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:883
+msgid "Send a LACPDU frame _every second"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:887
+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:903
+#, fuzzy
+msgid "_System priority"
+msgstr "_Prioritate:"
+
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:947
+msgid "System priority, value can be 0 – 65535."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:959
+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:971
+msgid "This selects the policy of how the aggregators will be selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:1006
+msgid ""
+"List of fragment types (strings) which should be used for packet Tx hash "
+"computation."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:1035
+msgid "_Fields for transmission hash"
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:1051
+msgid "In tenths of a second. Periodic interval between rebalancing."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:1063
+msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
+msgstr ""
+
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
+msgstr "P_utere de transmisie:"
+
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
+msgstr "P_utere de transmisie:"
+
+#: src/connection-editor/ce-page-team.ui:1119
+msgid "Runner"
+msgstr ""
+
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
+msgstr "Interfață:"
+
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Nume _interfață:"
+
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "Adresa MAC _clonată:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "Securitate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "P_utere de transmisie:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Rată:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "C_anal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Ban_dă:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:20
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Metode de autentificare permise"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versiunea 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
+#, fuzzy
 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 ""
 "În cele mai multe cazuri, serverul PPP al furnizorului va suporta toate "
 "metodele de autentificare. În cazul în care eșuează, încercați dezactivarea "
 "suportului pentru unele metode."
 
-#: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:326
-#: ../src/libnm-gtk/nm-ui-utils.c:321
-#, fuzzy
-msgid "Ethernet"
-msgstr "Ethernet automat"
-
-#: ../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:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:107
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-infiniband.c:150
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bridge.c:210
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../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"
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
+msgid "IP tunnel"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 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:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:194
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
+msgstr ""
+"Modulul VPN nu a reușit să importe corect conexiunea VPN\n"
+"\n"
+"Eroare: no există tip serviciul VPN."
+
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
+msgstr "Selectare fișier pentru import"
+
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Adresă fizică:"
 
-#: ../src/connection-editor/connection-helpers.c:221
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:290
-#: ../src/connection-editor/connection-helpers.c:292
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
-msgid "Import a saved VPN configuration..."
+msgid "Import a saved VPN configuration…"
 msgstr "Exportare conexiune VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:321
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2212,79 +3242,86 @@ msgstr ""
 "Fereastra de dialog a editorului de conexiuni nu a putut fi inițializată din "
 "cauza unei erori necunoscute."
 
-#: ../src/connection-editor/connection-helpers.c:330
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Nu s-a putut crea noua conexiune"
 
-#: ../src/connection-editor/connection-helpers.c:467
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Ștergerea conexiunii a eșuat"
 
-#: ../src/connection-editor/connection-helpers.c:515
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Sigur doriți să ștergeți conexiunea %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/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Conexiuni _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresă"
 
-#: ../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:1152
 msgid "Netmask"
 msgstr "Mască rețea"
 
-#: ../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:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../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 "Metrică"
 
-#: ../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:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Editare %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Editare conexiune fără nume"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Nume conexiune:"
 
-#: ../src/connection-editor/nm-connection-editor.c:187
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
-msgid "Editor initializing..."
+msgid "Editor initializing…"
 msgstr "Eroare la inițializarea editorului"
 
-#: ../src/connection-editor/nm-connection-editor.c:194
-#: ../src/connection-editor/nm-connection-list.c:397
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Adăugarea conexiunii a eșuat"
 
-#: ../src/connection-editor/nm-connection-editor.c:207
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:283
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2292,66 +3329,107 @@ msgstr ""
 "Editorul de conexiuni nu găsește niște resurse necesare (nu s-a găsit "
 "fișierul .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Salvează"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Salvează toate modificările făcute acestei conexiuni."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentificați-vă pentru a salva această conexiune pentru toți utilizatorii "
 "acestui calculator."
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Nu s-a putut crea noua conexiune"
 
-#: ../src/connection-editor/nm-connection-editor.c:437
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Nu s-a putut edita conexiunea"
 
-#: ../src/connection-editor/nm-connection-editor.c:439
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Eroare la crearea dialogului editorului de conexiuni."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/nm-connection-editor.c:742
+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:762
 msgid "Error initializing editor"
 msgstr "Eroare la inițializarea editorului"
 
-#: ../src/connection-editor/nm-connection-editor.c:921
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Adăugarea conexiunii a eșuat"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
+#: src/connection-editor/nm-connection-editor.ui:35
+msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:61
+#, fuzzy
+msgid ""
+"Security labels may prevent some files from being used with certificate "
+"authentication."
+msgstr ""
+"Definiți aceasta ca „TRUE” pentru a dezactiva avertismentele despre "
+"certificatele CA în autentificarea EAP."
+
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Nume conexiune:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
-msgid "_Export..."
+msgid "_Export…"
 msgstr "E_xportă"
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-editor.ui:260
+msgid "File Relabel"
+msgstr ""
+
+#: src/connection-editor/nm-connection-editor.ui:291
+#, fuzzy
+msgid "_Relabel"
+msgstr "etichetă"
+
+#: src/connection-editor/nm-connection-editor.ui:320
+msgid ""
+"The following files are not labelled for use with certificate "
+"authentication. Do you wish to adjust the labels?"
+msgstr ""
+
+#: src/connection-editor/nm-connection-editor.ui:347
+#, fuzzy
+msgid "Relabel"
+msgstr "etichetă"
+
+#: src/connection-editor/nm-connection-editor.ui:361
+msgid "Filename"
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "niciodată"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "acum"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2359,7 +3437,7 @@ msgstr[0] "acum un minut"
 msgstr[1] "acum %d minute"
 msgstr[2] "acum %d de minute"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2367,7 +3445,7 @@ msgstr[0] "acum o oră"
 msgstr[1] "acum %d ore"
 msgstr[2] "acum %d de ore"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2375,7 +3453,7 @@ msgstr[0] "acum o zi"
 msgstr[1] "acum %d zile"
 msgstr[2] "acum %d de zile"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2383,7 +3461,7 @@ msgstr[0] "acum o lună"
 msgstr[1] "acum %d luni"
 msgstr[2] "acum %d de luni"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2391,127 +3469,175 @@ msgstr[0] "acum un an"
 msgstr[1] "acum %d ani"
 msgstr[2] "acum %d de ani"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Adăugarea conexiunii a eșuat"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Conexiune cu fir %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Conexiune cu fir %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Nume"
 
-#: ../src/connection-editor/nm-connection-list.c:636
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Ultima folosire"
 
-#: ../src/connection-editor/nm-connection-list.c:684
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Modifică conexiunea selectată"
 
-#: ../src/connection-editor/nm-connection-list.c:685
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentificare pentru a modifica conexiunea selectată"
 
-#: ../src/connection-editor/nm-connection-list.c:700
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Șterge conexiunea selectată"
 
-#: ../src/connection-editor/nm-connection-list.c:701
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentificare pentru a șterge conexiunea selectată"
 
-#: ../src/connection-editor/nm-connection-list.c:912
-msgid "No VPN plugins are installed."
-msgstr ""
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Tip conexiune nesuportat către Internet mobil de bandă largă."
 
-#: ../src/connection-editor/nm-connection-list.c:914
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Nu se știe cum să se creeze conexiuni „%s”"
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Nu se știe cum să se editeze conexiunile „%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:916
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Eroare la editarea conexiunii"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Eroare la crearea conexiunii"
 
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Adăugarea conexiunii a eșuat"
+
+#: src/connection-editor/nm-connection-list.c:1091
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:1094
+#, fuzzy, c-format
+msgid "Don’t know how to create “%s” connections"
+msgstr "Nu se știe cum să se creeze conexiuni „%s”"
+
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Eroare la editarea conexiunii"
 
-#: ../src/connection-editor/nm-connection-list.c:939
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
+#: src/connection-editor/nm-connection-list.c:1129
+#, fuzzy, c-format
+msgid "Did not find a connection with UUID “%s”"
 msgstr "Nu s-a găsit o conexiune cu UUID-ul „%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:109
-msgid "802.1x Security"
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Conexiuni de rețea"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_Adaugă o conexiune VPN..."
+
+#: src/connection-editor/page-8021x-security.c:113
+#, fuzzy
+msgid "802.1X Security"
 msgstr "Securitate 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
-msgid "Could not load 802.1x Security user interface."
+msgid "Could not load 802.1X Security user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru securitate Wi-Fi."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Folosește securitatea 802.1X pentru această conexiune"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "nu s-a putut găsi dispozitivul Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexiune cu fir %d"
 
-#: ../src/connection-editor/page-bluetooth.c:302
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:320
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Activează _rețeaua"
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Rețea fără fir"
 
-#: ../src/connection-editor/page-bond.c:447
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-bond.c:566
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS primar:"
 
-#: ../src/connection-editor/page-bond.c:616
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Conexiune cu fir %d"
 
-#: ../src/connection-editor/page-bridge.c:213
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-bridge.c:310
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Conexiune cu fir %d"
@@ -2519,369 +3645,387 @@ msgstr "Conexiune cu fir %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-dcb.c:603
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:605
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator DSL."
 
-#: ../src/connection-editor/page-dsl.c:214
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Interfață:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexiune DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:74
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 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 ""
 "Această opțiune leagă această conexiune de dispozitivul de rețea specificat "
 "de adresa sa MAC permanentă introdusă aici. Exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:328
+#: src/connection-editor/page-ethernet.c:262
+#, fuzzy
+msgid "ignored"
+msgstr "Ignorat"
+
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../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:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Adresa MAC _clonată:"
 
-#: ../src/connection-editor/page-ethernet.c:465
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:500
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexiune cu fir %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/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Implicit"
 
-#: ../src/connection-editor/page-general.c:52
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:53
-#, fuzzy
-msgid "FirewallD is not running."
-msgstr "NetworkManager nu este pornit..."
-
-#: ../src/connection-editor/page-general.c:350
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
+#, fuzzy
 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 ""
+"Această opțiune leagă această conexiune de dispozitivul de rețea specificat "
+"de adresa sa MAC permanentă introdusă aici. Exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:153
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru conexiunile Wi-Fi."
 
-#: ../src/connection-editor/page-infiniband.c:216
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexiune cu fir %d"
 
-#: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:129
+#: src/connection-editor/page-ip-tunnel.c:175
+#, fuzzy
+msgid "Could not load IP tunnel user interface."
+msgstr "Nu s-a putut încărca interfața de utilizator IPv4."
+
+#: src/connection-editor/page-ip-tunnel.c:289
+#, fuzzy, c-format
+msgid "IP tunnel connection %d"
+msgstr "Conexiune cu fir %d"
+
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automată (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Doar adrese automate (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automat, doar adresele"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:132
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automat (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Doar adrese automate (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automată (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Doar adrese primite automat (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:179
-#: ../src/connection-editor/page-ip6.c:197
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Doar legătură locală"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:295
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "Servere _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:304
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "Domenii de cău_tare:"
 
-#: ../src/connection-editor/page-ip4.c:965
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modificare rute IPV4 pentru %s"
 
-#: ../src/connection-editor/page-ip4.c:1158
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Opțiuni IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1160
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1253
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
-msgid "IPv4 address \"%s\" invalid"
+msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1261
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
-msgid "IPv4 address netmask \"%s\" invalid"
+msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1270
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
-msgid "IPv4 gateway \"%s\" invalid"
+msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1313
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
-msgid "IPv4 DNS server \"%s\" invalid"
+msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:148
-msgid "Ignore"
-msgstr "Ignoră"
-
-#: ../src/connection-editor/page-ip6.c:172
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automat, doar DHCP"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editarea rutelor IPv6 pentru %s"
 
-#: ../src/connection-editor/page-ip6.c:1155
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Configurări IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1157
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Nu s-a putut încărca interfața utilizator IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1248
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
-msgid "IPv6 address \"%s\" invalid"
+msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1256
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
-msgid "IPv6 prefix \"%s\" invalid"
+msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1265
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
-msgid "IPv6 gateway \"%s\" invalid"
+msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
-msgid "IPv6 DNS server \"%s\" invalid"
+msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Nu s-a putut încărca interfața de utilizator DSL."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Conexiune DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:249
+#: src/connection-editor/page-master.c:236
 #, c-format
-msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:260
+#: src/connection-editor/page-master.c:247
 #, c-format
 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 ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru Internet mobil de bandă "
 "largă."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tip conexiune nesuportat către Internet mobil de bandă largă."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:529
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Selectați tipul furnizorului de Internet mobil de bandă largă"
 
-#: ../src/connection-editor/page-mobile.c:556
+#: src/connection-editor/page-mobile.c:564
+#, fuzzy
 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 ""
 "Selectați tehnologia folosită de furnizorul dumneavoastră de Internet mobil "
 "de bandă largă. Dacă nu știți ce să alegeți, întrebați furnizorul."
 
-#: ../src/connection-editor/page-mobile.c:561
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Furnizorul folosește tehnologie bazată pe _GSM (de ex. 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:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Furnizorul folosește tehnologie bazată pe C_DMA (de ex. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:258
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:303
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:280
-#: ../src/wireless-security/eap-method-peap.c:272
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nimic"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editare metode autentificare PPP pentru %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Configurări PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator PPP."
 
-#: ../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 "Selectare fișier pentru import"
+#: src/connection-editor/page-proxy.c:212
+msgid "Proxy"
+msgstr ""
 
-#: ../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-proxy.c:214
+#, fuzzy
+msgid "Could not load proxy user interface."
 msgstr ""
+"Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-team.c:270
+#: 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"
+msgstr ""
+
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr ""
 "Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
 
-#: ../src/connection-editor/page-team.c:377
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Conexiune cu fir %d"
@@ -2889,11 +4033,11 @@ msgstr "Conexiune cu fir %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:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:153
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr ""
@@ -2902,74 +4046,62 @@ 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:413
 #, c-format
-msgid "%s (via \"%s\")"
+msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:426
-#, fuzzy, c-format
-msgid "New connection..."
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
+msgid "New connection…"
 msgstr "Nu există conexiuni la rețea"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator IPv4."
 
-#: ../src/connection-editor/page-vlan.c:734
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:797
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "Conexiune VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:96
-msgid "Could not load VPN user interface."
-msgstr "Nu s-a putut încărca interfața de utilizator VPN."
-
-#: ../src/connection-editor/page-vpn.c:111
-#, fuzzy, c-format
-#| msgid "Could not find VPN plugin service for '%s'."
-msgid "Could not find VPN plugin for '%s'."
-msgstr "Nu s-a găsit un modul VPN pentru serviciul „%s”."
-
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, 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)."
 msgstr "Nu s-a găsit un modul VPN pentru serviciul „%s”."
 
-#: ../src/connection-editor/page-vpn.c:121
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Adăugarea conexiunii a eșuat"
 
-#: ../src/connection-editor/page-vpn.c:214
-#: ../src/connection-editor/page-vpn.c:309
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Nu s-a putut încărca interfața de utilizator VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Nu s-a găsit un modul VPN pentru serviciul „%s”."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexiune 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 ""
-"Modulul VPN nu a reușit să importe corect conexiunea VPN\n"
-"\n"
-"Eroare: no există tip serviciul VPN."
-
-#: ../src/connection-editor/page-vpn.c:263
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Alegeți un tip de conexiune VPN"
 
-#: ../src/connection-editor/page-vpn.c:264
+#: src/connection-editor/page-vpn.c:206
+#, fuzzy
 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 ""
@@ -2977,144 +4109,121 @@ msgstr ""
 "conexiune. Dacă tipul conexiunii pe care doriți să o creați nu apare în "
 "listă, înseamnă că nu aveți instalat modulul pentru acel tip de VPN."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 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 ""
 "Această opțiune leagă această conexiune de punctul de acces (AP) specificat "
 "de BSSID-ul introdus aici. Exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 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 ""
 "Această opțiune leagă această conexiune de dispozitivul de rețea specificat "
 "de adresa sa MAC permanentă introdusă aici. Exemplu: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:450
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru conexiunile Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:577
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Orice dispozitiv"
 
-#: ../src/connection-editor/page-wifi.c:619
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexiune cu fir %d"
 
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Cheie WEP 40/128-biți (Hex sau ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:319
-#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Parolă WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
-msgid "Dynamic WEP (802.1x)"
+#: src/connection-editor/page-wifi-security.c:391
+#, fuzzy
+msgid "Dynamic WEP (802.1X)"
 msgstr "WEP dinamic (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA și WPA2 personal"
 
-#: ../src/connection-editor/page-wifi-security.c:371
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA și WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"Nu s-a putut încărca interfața de utilizator pentru securitate Wi-Fi; lipsesc "
-"configurări Wi-Fi."
+"Nu s-a putut încărca interfața de utilizator pentru securitate Wi-Fi; "
+"lipsesc configurări Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:424
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Securitate fără  fir"
 
-#: ../src/connection-editor/page-wifi-security.c:426
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru securitate Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:506
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:512
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:138
-msgid "Cannot import VPN connection"
-msgstr "Nu s-a putut importa conexiunea VPN"
-
-#: ../src/connection-editor/vpn-helpers.c:140
-#, c-format
-msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
-msgstr ""
-"Fișierul „%s” nu poate fi citit sau nu conține informații de conexiune VPN\n"
-"\n"
-"Eroare: %s."
-
-#: ../src/connection-editor/vpn-helpers.c:141
-#, fuzzy
-msgid "unknown error"
-msgstr "necunoscut"
-
-#: ../src/connection-editor/vpn-helpers.c:215
-#, c-format
-msgid "A file named \"%s\" already exists."
+#: src/connection-editor/vpn-helpers.c:132
+#, fuzzy, c-format
+msgid "A file named “%s” already exists."
 msgstr "Deja există un fișier cu numele „%s”."
 
-#: ../src/connection-editor/vpn-helpers.c:217
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "Î_nlocuiește"
 
-#: ../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 "Doriți să înlocuiți %s cu conexiunea VPN pe care o salvați?"
 
-#: ../src/connection-editor/vpn-helpers.c:255
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nu s-a putut exporta conexiunea VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:257
-#, c-format
+#: src/connection-editor/vpn-helpers.c:174
+#, fuzzy, c-format
 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 ""
@@ -3122,102 +4231,187 @@ msgstr ""
 "\n"
 "Eroare: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:292
-msgid "Export VPN connection..."
+#: src/connection-editor/vpn-helpers.c:209
+#, fuzzy
+msgid "Export VPN connection…"
 msgstr "Exportare conexiune VPN..."
 
-#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Miniaplicația NetworkManager nu a putut găsi unele resurse (nu s-a putut "
-"găsi fișierul .ui)."
-
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Deblochează"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Detalii conexiune"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Conexiuni de rețea active"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
 msgstr ""
-"Conexiunea la Internet mobil de bandă largă este configurată cu următoarele "
-"valori:"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Dispozitiv:"
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
+#, fuzzy
+msgid "No certificate set"
+msgstr "Certific_at de la o autoritate de certificare:"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Furnizor:"
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
+msgid "No key set"
+msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Plan:"
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
+#, fuzzy, c-format
+msgid "Choose a key for %s Certificate"
+msgstr "Selectați certificatul personal..."
 
-#: ../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."
-msgstr ""
-"Se va realiza o conexiune către furnizorul de Internet mobil de bandă largă "
-"folosind configurațiile pe care le-ați selectat. Dacă nu se poate realiza "
-"conexiunea sau nu puteți accesa resursele rețelei, verificați din nou aceste "
-"configurații. Pentru a modifica configurațiile conexiunii alegeți „Conexiuni "
-"de rețea” din meniul Sistem >> Preferințe."
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
+msgstr "C_heie privată:"
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Confirmare configurații Internet mobil de bandă largă"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
+msgstr "Parola pentru cheia _privată:"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-file-cert-chooser.c:258
+#, fuzzy, c-format
+msgid "Choose %s Certificate"
+msgstr "Selectați certificatul personal..."
+
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
+msgstr "Certificat _utilizator:"
+
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Țara mea nu este în listă"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nelistat"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Planul meu nu este listat..."
+
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "Furnizor"
+
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "Dispozitive GSM instalate"
+
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "Dispozitive CDMA instalate"
+
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Orice dispozitiv"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Conexiune nouă de Internet mobil de bandă largă"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Acest asistent vă ajută să configurați o conexiune la Internet mobil de "
+"bandă largă către o rețea celulară (3G)."
+
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "Aveți nevoie de următoarele informații:"
+
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "Numele furnizorului"
+
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr "Numele planului de facturare"
+
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(în unele cazuri) APN-ul (Numele punctului de acces) al planului de facturare"
+
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
+msgstr ""
+"Creează o conexiune pentru aces_t dispozitiv de acces la Internet mobil de "
+"bandă largă:"
+
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Configurează o conexiune către Internet mobil de bandă largă"
+
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Țară sau regiune"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Alegeți țara sau regiunea furnizorului"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Alegeți furnizorul din _listă:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Furnizorul meu folosește tehnologie GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Furnizorul meu folosește tehnologie CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Alegeți furnizorul"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Selectați planul:"
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Plan _APN (Nume punct de acces) selectat:"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
 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 ""
 "Avertisment: alegerea unui plan incorect poate duce la probleme de facturare "
 "a contului de rețea mobilă de bandă largă sau pot împiedica conectivitatea.\n"
@@ -3225,238 +4419,238 @@ msgstr ""
 "Dacă sunteți nesigur de plan, întrebați furnizorul care este APN-ul planului "
 "dumneavoastră."
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Alegeți planul de facturare"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed..."
-msgstr "Planul meu nu este listat..."
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Conexiunea la Internet mobil de bandă largă este configurată cu următoarele "
+"valori:"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Alegeți furnizorul din _listă:"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Dispozitiv:"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-msgstr "Furnizor"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Furnizor:"
 
-#: ../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:"
-msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Plan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Furnizor:"
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Se va realiza o conexiune către furnizorul de Internet mobil de bandă largă "
+"folosind configurațiile pe care le-ați selectat. Dacă nu se poate realiza "
+"conexiunea sau nu puteți accesa resursele rețelei, verificați din nou aceste "
+"configurații. Pentru a modifica configurațiile conexiunii alegeți „Conexiuni "
+"de rețea” din meniul Sistem >> Preferințe."
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Furnizorul meu folosește tehnologie GSM (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Confirmare configurații Internet mobil de bandă largă"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Furnizorul meu folosește tehnologie CDMA (1xRTT, EVDO)"
+#: src/libnma/nma-cert-chooser-button.c:167
+#, fuzzy
+msgid "(None)"
+msgstr "(nici una)"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Alegeți furnizorul"
+#: src/libnma/nma-cert-chooser-button.c:175
+#, c-format
+msgid "Key in %s"
+msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista țărilor și a regiunilor:"
+#: src/libnma/nma-cert-chooser-button.c:176
+#, fuzzy, c-format
+msgid "Certificate in %s"
+msgstr "Certific_at de la o autoritate de certificare:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Țară sau regiune"
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Necunoscută"
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Țara mea nu este în listă"
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
+#, fuzzy
+msgid "Select"
+msgstr "Alegeți un fișier"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider's Country or Region"
-msgstr "Alegeți țara sau regiunea furnizorului"
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
+#, fuzzy
+msgid "Cancel"
+msgstr "_Anulează"
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "Dispozitive GSM instalate"
+#: src/libnma/nma-cert-chooser-button.c:474
+#, fuzzy
+msgid "Select from file…"
+msgstr "Alegeți un fișier"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "Dispozitive CDMA instalate"
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
+#, fuzzy, c-format
+msgid "Choose a %s Certificate"
+msgstr "Selectați certificatul personal..."
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
-msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-"Acest asistent vă ajută să configurați o conexiune la Internet mobil de "
-"bandă largă către o rețea celulară (3G)."
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Certificat _utilizator:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "Aveți nevoie de următoarele informații:"
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+msgid "Error logging in: "
+msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider's name"
-msgstr "Numele furnizorului"
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#, fuzzy
+msgid "Error opening a session: "
+msgstr "Eroare la editarea conexiunii"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr "Numele planului de facturare"
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
+#, fuzzy
+msgid "_Unlock token"
+msgstr "_Deblochează"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
+msgid "Issued By"
 msgstr ""
-"(în unele cazuri) APN-ul (Numele punctului de acces) al planului de facturare"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
+#, c-format
+msgid "Enter %s PIN"
 msgstr ""
-"Creează o conexiune pentru aces_t dispozitiv de acces la Internet mobil de "
-"bandă largă:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Orice dispozitiv"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
-msgstr "Configurează o conexiune către Internet mobil de bandă largă"
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
+msgid "_Login"
+msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1613
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Conexiune nouă de Internet mobil de bandă largă"
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
+msgid "_Remember PIN"
+msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Cere această parolă de _fiecare dată"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Este necesară o parolă pentru conectarea la „%s”."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Parolă:"
+msgid "Sh_ow passwords"
+msgstr "Afișea_ză parolele"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
-msgid "_Ternary Password:"
+msgid "_Tertiary Password:"
 msgstr "_Parolă:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "Afișea_ză parolele"
+msgid "_Secondary Password:"
+msgstr "_Parolă:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Parolă:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Deconectează"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
-msgid "New..."
-msgstr "Nouă..."
-
-#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Niciuna"
 
-#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP dinamic (802.1x)"
+
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "C_reează"
 
-#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 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 ""
 "Este necesară parola sau cheia de criptare pentru a accesa rețeaua fără fir "
 "„%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Se cere autentificarea în rețeaua fără fir"
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificarea este necesară pentru rețeaua fără fir"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Creează rețea fără fir nouă"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rețea fără fir nouă"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 "Introduceți un nume pentru rețeaua fără fir pe care doriți să o creați."
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectare la rețea fără fir ascunsă"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Rețea fără fir ascunsă"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -3465,37 +4659,55 @@ msgstr ""
 "Introduceți numele și detaliile de securitate pentru rețeaua fără fir "
 "ascunsă la care doriți să vă conectați."
 
-#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "Secur_itatea rețelei fără fir:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "Co_nexiune:"
 
-#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "_Adaptor rețea fără fir:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Nu pot găsi furnizorul, dar doresc să îl introduc _manual:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Furnizor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista țărilor și a regiunilor:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Țară sau regiune"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Cu fir"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -3505,17 +4717,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Secur_itatea rețelei fără fir:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Nume rețea:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "Co_nexiune:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "_Adaptor rețea fără fir:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Utilizare:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3523,7 +4759,7 @@ msgstr ""
 "Acest program este o componentă a aplicației NetworkManager (https://wiki."
 "gnome.org/Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3531,442 +4767,531 @@ msgstr ""
 "Nu este conceput pentru utilizare în linia de comandă, ci pentru a rula în "
 "mediul desktop GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "neactivat"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neînregistrat"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rețea de domiciliu (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Rețea de domiciliu"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "se caută"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "înregistrare refuzată"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rețea roaming (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Rețea roaming"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
+msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Cod PIN necesar"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 "Este necesar codul PIN pentru dispozitivul de acces la Internet mobil de "
 "bandă largă"
 
-#: ../src/mobile-helpers.c:619
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+#: src/mobile-helpers.c:621
+#, fuzzy, c-format
+msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:179
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Conexiune DSL %d"
 
-#: ../src/wireless-security/eap-method.c:56
-msgid "undefined error in 802.1x security (wpa-eap)"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:255
-msgid "unspecified error validating eap-method file"
-msgstr ""
+#: src/utils/utils.c:549
+#, fuzzy
+msgid "PEM certificates (*.pem, *.crt, *.cer)"
+msgstr "Certificate DER sau PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method.c:452
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, sau PKCS#12 chei private (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:455
-msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
-msgstr "Certificate DER sau PEM (*.der, *.pem, *.crt, *.cer)"
+#: src/wireless-security/eap-method.c:57
+msgid "undefined error in 802.1X security (wpa-eap)"
+msgstr ""
+
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Certific_at de la o autoritate de certificare:"
 
-#: ../src/wireless-security/eap-method-fast.c:70
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
+msgstr ""
+
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:265
-#: ../src/wireless-security/eap-method-peap.c:302
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:403
-msgid "Choose a PAC file..."
+#: src/wireless-security/eap-method-fast.c:407
+msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "Identitate anoni_mă:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "Autentificare"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Identitate anoni_mă:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Aute_ntificare internă:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:63
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:69
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:63
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:68
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:287
-#: ../src/wireless-security/eap-method-ttls.c:318
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 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
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Alegeți certificatul autorității de certificare..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Versiunea 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Versiunea 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "Certific_at de la o autoritate de certificare:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Certific_at de la o autoritate de certificare:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "Versiune _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:72
-msgid "missing EAP username"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:82
-msgid "missing EAP password"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:66
-msgid "missing EAP-TLS identity"
+#: src/wireless-security/eap-method-simple.c:90
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:71
-#, fuzzy, c-format
-msgid "invalid EAP-TLS CA certificate: %s"
-msgstr "Certific_at de la o autoritate de certificare:"
-
-#: ../src/wireless-security/eap-method-tls.c:76
-msgid "invalid EAP-TLS CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-simple.c:106
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:84
-msgid "invalid EAP-TLS password: missing"
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:94
-#, c-format
-msgid "invalid EAP-TLS private-key: %s"
-msgstr ""
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Parola pentru cheia _privată:"
 
-#: ../src/wireless-security/eap-method-tls.c:101
-#, c-format
-msgid "invalid EAP-TLS user-certificate: %s"
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Afișea_ză parolele"
+
+#: src/wireless-security/eap-method-tls.c:64
+msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:296
-msgid "Unencrypted private keys are insecure"
-msgstr "Cheile private necriptate sunt nesigure"
+#: src/wireless-security/eap-method-tls.c:256
+#, fuzzy
+msgid "no user certificate selected"
+msgstr "Certific_at de la o autoritate de certificare:"
 
-#: ../src/wireless-security/eap-method-tls.c:299
-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)"
+#: src/wireless-security/eap-method-tls.c:261
+msgid "selected user certificate file does not exist"
 msgstr ""
-"Cheia privată aleasă nu pare a fi protejată de o parolă. Acest lucru poate "
-"compromite securitatea datelor de autentificare. Alegeți o cheie privată "
-"protejată de parolă.\n"
-"\n"
-"(Puteți proteja prin parolă cheia privată folosind openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:475
-msgid "Choose your personal certificate..."
-msgstr "Selectați certificatul personal..."
+#: src/wireless-security/eap-method-tls.c:281
+msgid "no key selected"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:487
-msgid "Choose your private key..."
-msgstr "Selectați cheia privată..."
+#: src/wireless-security/eap-method-tls.c:286
+msgid "selected key file does not exist"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "I_dentitate:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-msgid "_User certificate:"
-msgstr "Certificat _utilizator:"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:5
-msgid "Private _key:"
-msgstr "C_heie privată:"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_Private key password:"
-msgstr "Parola pentru cheia _privată:"
-
-#: ../src/wireless-security/eap-method-ttls.c:63
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:68
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
+#: src/wireless-security/eap-method-ttls.c:337
+#, fuzzy
+msgid "MSCHAPv2 (no EAP)"
+msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
-msgid "Unknown error validating 802.1x security"
+#: src/wireless-security/wireless-security.c:72
+msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS tunelat"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protejat (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/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "_Autentificare:"
 
-#: ../src/wireless-security/ws-leap.c:61
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:69
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:105
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:125
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:131
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:133
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Implicit)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Sistem deschis"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Cheie partajată"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Implicit)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "C_heie:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Afișea_ză cheia"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "Inde_x WEP"
 
-#: ../src/wireless-security/ws-wpa-psk.c:69
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:77
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Tip:"
 
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' disconnected because the VPN service stopped."
+#~ msgstr ""
+#~ "\n"
+#~ "Conexiunea VPN „%s” a fost deconectată deoarece serviciul VPN a fost "
+#~ "oprit."
+
+#~ msgid ""
+#~ "\n"
+#~ "The VPN connection '%s' disconnected."
+#~ msgstr ""
+#~ "\n"
+#~ "Conexiunea VPN „%s” a fost deconectată."
+
+#~ msgid "New Mobile Broadband connection..."
+#~ msgstr "Conexiune nouă de Internet mobil de bandă largă..."
+
+#~ msgid "_Connect to Hidden Wi-Fi Network..."
+#~ msgstr "_Conectează la o rețea fără fir ascunsă..."
+
+#~ msgid "Create _New Wi-Fi Network..."
+#~ msgstr "Creează rețea fără fir _nouă..."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (implicită)"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Eșec în actualizarea secretelor conexiunii din cauza unei erori "
+#~ "necunoscute."
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritate:"
+
+#~ 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 "Aut_onegotiate"
+#~ msgstr "Aut_onegociere"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#, fuzzy
+#~ msgid "FirewallD is not running."
+#~ msgstr "NetworkManager nu este pornit..."
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Nu s-a putut importa conexiunea VPN"
+
+#~ msgid ""
+#~ "The file '%s' could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Fișierul „%s” nu poate fi citit sau nu conține informații de conexiune "
+#~ "VPN\n"
+#~ "\n"
+#~ "Eroare: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "necunoscut"
+
+#~ msgid "New..."
+#~ msgstr "Nouă..."
+
+#~ msgid "Choose a Certificate Authority certificate..."
+#~ msgstr "Alegeți certificatul autorității de certificare..."
+
+#, fuzzy
+#~ msgid "invalid EAP-TLS CA certificate: %s"
+#~ msgstr "Certific_at de la o autoritate de certificare:"
+
+#~ msgid "Unencrypted private keys are insecure"
+#~ msgstr "Cheile private necriptate sunt nesigure"
+
+#~ msgid ""
+#~ "The selected private key does not appear to be protected by a password.  "
+#~ "This could allow your security credentials to be compromised.  Please "
+#~ "select a password-protected private key.\n"
+#~ "\n"
+#~ "(You can password-protect your private key with openssl)"
+#~ msgstr ""
+#~ "Cheia privată aleasă nu pare a fi protejată de o parolă. Acest lucru "
+#~ "poate compromite securitatea datelor de autentificare. Alegeți o cheie "
+#~ "privată protejată de parolă.\n"
+#~ "\n"
+#~ "(Puteți proteja prin parolă cheia privată folosind openssl)"
+
+#~ msgid "Choose your private key..."
+#~ msgstr "Selectați cheia privată..."
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Administrator rețea"
@@ -4038,12 +5363,6 @@ msgstr "_Tip:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS secundar:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS terțiar:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Activează Internetul mobil de bandă largă WiMA_X"
 
@@ -4053,9 +5372,6 @@ msgstr "_Tip:"
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Alte rețele fără fir..."
 
-#~ msgid "label"
-#~ msgstr "etichetă"
-
 #~ msgid "2G (GPRS/EDGE)"
 #~ msgstr "2G (GPRS/EDGE)"
 
@@ -4109,12 +5425,6 @@ msgstr "_Tip:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "Disponibil tuturor utilizatorilor"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "Conectează _automat"
-
-#~ msgid "_Import"
-#~ msgstr "_Importă"
-
 #~ msgid "Error saving connection"
 #~ msgstr "Eroare la salvarea conexiunii"
 
@@ -4137,10 +5447,6 @@ msgstr "_Tip:"
 #~ msgid "_Delete..."
 #~ msgstr "Șter_ge..."
 
-#~| msgid "Could not edit connection"
-#~ msgid "Don't know how to edit '%s' connections"
-#~ msgstr "Nu se știe cum să se editeze conexiunile „%s”"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefonul este acum gata de utilizare!"
 
@@ -4150,9 +5456,6 @@ msgstr "_Tip:"
 #~ msgid "Error: %s"
 #~ msgstr "Eroare: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Nu s-a putut crea conexiunea DUN: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "Asistentul mobil a fost anulat"
 
@@ -4244,17 +5547,6 @@ msgstr "_Tip:"
 #~ msgid "Unknown"
 #~ msgstr "Necunoscută"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Launchpad Contributions:\n"
-#~ "  Adi Roiban https://launchpad.net/~adiroiban\n"
-#~ "  Alex Bernea https://launchpad.net/~alex-bernea\n"
-#~ "  Alexandru Cucu https://launchpad.net/~alexandru.cucu\n"
-#~ "  Claudia Cotună https://launchpad.net/~special4ti\n"
-#~ "  Cosmin https://launchpad.net/~cosminonofre\n"
-#~ "  Ionuț Jula https://launchpad.net/~ionutjula\n"
-#~ "  Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
@@ -4402,9 +5694,6 @@ msgstr "_Tip:"
 #~ msgid "WEP 40/128-bit Key"
 #~ msgstr "WEP cheie de 40/128-bit"
 
-#~ msgid "Select A File"
-#~ msgstr "Alegeți un fișier"
-
 #~ msgid "_Disconnect VPN..."
 #~ msgstr "_Deconectare VPN..."
 
diff --git a/po/ru.po b/po/ru.po
index 886af3f9..3f7cc9d3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-09-12 20:54+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
@@ -25,45 +26,54 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Сеть"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Управление сетевыми соединениями"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "Активные сетевые соединения"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Управление параметрами сетевых соединений"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Отключить уведомления о подключении"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Установите в TRUE, чтобы отключить уведомления при подключении к сети."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Отключить уведомления об отключении"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Установите в TRUE, чтобы отключить уведомления при отключении от сети."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Отключить уведомления от VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -71,52 +81,53 @@ msgstr ""
 "Установите в TRUE, чтобы отключить уведомления при подключении или "
 "отключении от VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Не показывать уведомления о доступных сетях"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Установите в TRUE, чтобы отключить уведомления о доступных сетях Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Штамп"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Используется для определения параметров, которые должны быть перенесены в "
 "новую версию."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Отключить создание соединения Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Установите в TRUE, чтобы отключить создание сетей ad-hoc при использовании "
 "апплета."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Показывать апплет в области уведомлений"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Установите в FALSE, чтобы отключить отображение апплета в области "
 "уведомлений."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Игнорировать сертификат CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -124,7 +135,7 @@ msgstr ""
 "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
 "аутентификации EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -132,15 +143,15 @@ msgstr ""
 "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
 "второго этапа аутентификации EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Редактор подключений NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -148,7 +159,7 @@ msgstr ""
 "NetworkManager — системная служба для управления и настройки сетевых "
 "подключений и устройств."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -156,21 +167,21 @@ msgstr ""
 "Программа nm-connection-editor работает с NetworkManager для создания и "
 "редактирования существующих профилей подключений для NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Разработчики NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "класс объекта «%s» не имеет свойства с именем «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "свойство «%s» класса объекта «%s» не доступно для записи"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -178,19 +189,19 @@ msgstr ""
 "свойство построения «%s» для объекта «%s» не может быть установлено после "
 "построения"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "«%s::%s'» не является допустимым именем свойства; «%s» не является подтипом "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "не удалось установить свойство «%s» типа «%s» из значения типа «%s»"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -199,81 +210,80 @@ msgstr ""
 "значение «%s» типа «%s» недействительно или вне диапазона для свойства «%s» "
 "типа «%s»"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Аутентификация 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "П_одключиться"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Имя сети"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "безопасный."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Не удалось создать/включить соединение"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Сбой подключения"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Сбой устройства при отключении"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Сбой при отключении"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Сбой при включении соединения"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Больше не показывать это сообщение"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +293,7 @@ msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано, поскольку подключение к сети было прервано."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -294,7 +304,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку подключение к сети было "
 "прервано."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +314,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN неожиданно "
 "завершилась."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +325,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN вернула неверную "
 "конфигурацию."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +334,7 @@ msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку превышено время ожидания."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +344,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN не запустилась "
 "вовремя."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -344,7 +354,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку не удалось запустить службу "
 "VPN."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -354,7 +364,7 @@ msgstr ""
 "Произошёл сбой соединения VPN «%s», поскольку не удалось найти подходящий "
 "ключ VPN."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -363,7 +373,7 @@ msgstr ""
 "\n"
 "Не удалось установить VPN-соединение «%s», неверный ключ доступа VPN."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -372,7 +382,7 @@ msgstr ""
 "\n"
 "Сбой VPN-соединения «%s»."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -383,19 +393,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Соединение VPN успешно установлено.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Сообщение авторизации VPN"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Сбой соединения VPN"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -408,7 +418,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -421,562 +431,573 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "устройство не готово (нет прошивки)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "устройство не готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "соединение разорвано"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "устройство не управляется"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Нет доступных сетевых устройств"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Соединения _VPN"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Настроить VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Добавить VPN-соединение…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Служба NetworkManager не запущена…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Поддержка сети отключена"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Включить поддержку сети"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Включить _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Включить _мобильную связь"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Включить _уведомления"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "C_ведения о соединении"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Изменить соединения…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Вы подключены к сети «%s»."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Соединение разорвано"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Сетевое соединение было разорвано."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Подготовка сетевого соединения «%s»…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Для сетевого соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Получение сетевого адреса для «%s»…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Сетевое соединение «%s» активно"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Устанавливается VPN-соединение «%s»…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Для VPN-соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Запрос адреса VPN для «%s»…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-соединение активно"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Нет подключения к сети"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Апплет NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Неправильный PUK-код, обратитесь к оператору сети."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Неправильный PIN-код, обратитесь к оператору сети."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Отправка кода разблокировки…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобильная связь (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобильная связь"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Доступно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Создать подключение мобильной связи…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Соединение установлено"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Вы подключены к сети мобильной связи."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Сеть мобильной связи."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Вы зарегистрированы в домашней сети."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Вы зарегистрированы в роуминговой сети."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Вы подключены к сети мобильной связи."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Подготовка соединения мобильной связи «%s»…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Настройка соединения мобильной связи «%s»…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Для соединения мобильной связи «%s» требуется аутентификация…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Соединение мобильной связи «%s» активно"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Автоматический Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Сети Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Сеть Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Сети Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Сеть Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Вы подключены к сети ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Подготовка сетевого соединения ethernet «%s»…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Настройка сетевого соединения ethernet «%s»…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Для сетевого соединения ethernet «%s» требуется аутентификация…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Запрос адреса сетевого соединения ethernet для «%s»…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Сетевое соединение ethernet «%s» активно"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Аутентификация DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Подключиться к скрытой сети Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Создать _новую сеть Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Не удалось добавить новое соединение"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Недостаточно прав."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сети Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сеть Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Сеть Wi-Fi"
 msgstr[1] "Сети Wi-Fi"
 msgstr[2] "Сетей Wi-Fi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключен"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi выключен механическим переключателем"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Ещё сети"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Доступны сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Используйте меню сети для подключения к сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Вы подключены к сети Wi-Fi «%s»."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Подготовка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Настройка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Для соединения Wi-Fi «%s» требуется аутентификация…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Запрос адреса сети Wi-Fi для «%s»…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Сетевое соединение Wi-Fi «%s» активно: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Сетевое соединение Wi-Fi «%s» активно"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Не удалось включить соединение"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Ошибка показа сведений о соединении:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамический WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Дополнительные адреса"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Нет"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (по умолчанию)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мбит/c"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-адрес"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Широковещательный адрес"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Маска подсети"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Первичный"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Второй пароль:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Основное"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Аппаратный адрес"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Скорость"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Защита:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Шлюз по умолчанию"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Игнорируется"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Точка доступа"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Тип VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Шлюз VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Имя пользователя VPN"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Баннер VPN"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Основное соединение"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Активные соединения отсутствуют!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -986,22 +1007,22 @@ msgstr ""
 "Авторское право © 2005-2008 Novell, Inc.\n"
 "и многие другие участники сообщества и переводчики"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Апплет области уведомления для управления сетевыми устройствами и "
 "соединениями."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr "Stas Solovey <whats_up@tut.by>, 2010-2018."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1009,33 +1030,33 @@ msgstr ""
 "Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не "
 "найден .ui-файл интерфейса)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Отсутствуют ресурсы"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Пароль сети мобильной связи"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Для подключения к «%s» требуется пароль."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1043,25 +1064,25 @@ msgid ""
 msgstr "Для работы устройства мобильной связи «%s» требуется PIN-код SIM."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Показывать PIN-код"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1069,41 +1090,41 @@ msgid ""
 msgstr "Для работы устройства мобильной связи «%s» требуется PUK-код SIM."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Новый PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Введите новый PIN-код ещё раз:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Показывать PIN/PUK-коды"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Соединение не имеет настроек VPN"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Не удалось записать соединение в VPN UI: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Не удалось записать соединение в VPN UI: незавершённая запись"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1111,41 +1132,41 @@ msgstr ""
 "IP-адреса определяют ваш компьютер в сети. Нажмите кнопку «Добавить», чтобы "
 "добавить IP-адрес."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Игнорировать автоматически полученные маршруты"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Ис_пользовать это соединение только для ресурсов в этой сети"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1153,15 +1174,15 @@ msgstr ""
 "Если включено, то это соединение никогда не будет использоваться как сетевое "
 "соединение по умолчанию."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "_Создать…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Выберите тип соединения"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1173,85 +1194,94 @@ msgstr ""
 "Если при создании VPN-соединения, оно не отображается в списке, возможно, не "
 "установлен соответствующий модуль VPN."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Устройство"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Активное резервирование"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Адаптивная балансировка нагрузки передачи"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Адаптивная балансировка нагрузки"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (рекомендуется)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
 # есть bond и есть team, принцип работы один, но нужно уточнять что имелось ввиду
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "Агрегированные _соединения (bond)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "_Режим"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Изменить"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "_Частота мониторинга"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "мс"
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "_Имя интерфейса"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "_Мониторинг соединения"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "_Цели ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1259,19 +1289,19 @@ msgstr ""
 "IP-адрес или список IP-адресов, разделённых запятыми, используемые для "
 "проверки состояния связи."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Задержка _установки соединения"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Задержка _разрыва соединения"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Первичный"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1279,66 +1309,69 @@ 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байт"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "Стоимость _пути"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Приоритет"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "Режим _петли"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "_Соединения типа мост"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Задержка _перенаправления"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "Интервал _hello"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Задержка пересылки STP, в секундах"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Время приветствия STP, в секундах"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Включить I_GMP snooping"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1349,17 +1382,17 @@ msgstr ""
 "отказываться включать эту функцию до тех пор, пока конфликты не будут "
 "устранены."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Включить _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "Управляет включением протокола Spanning Tree Protocol (STP) для этого моста"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1367,27 +1400,27 @@ msgstr ""
 "STP для этого моста. Более низкие значения «лучше»; мост с наименьшим "
 "приоритетом будет выбран корневым мостом."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Максимальный возраст"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Максимальный возраст сообщения STP, в секундах"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "_Время старения"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Время старения MAC-адреса Ethernet, в секундах"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "Маска _перенаправления группы"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1399,40 +1432,40 @@ msgstr ""
 "переадресован. Маска не может иметь биты 0, 1 или 2, потому что они "
 "используются для STP, кадров MAC-пауз и LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматический"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "неизвестная ошибка"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Сохранённый"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Постоянный"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Случайный"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Стабильный"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1442,182 +1475,225 @@ msgstr ""
 "устройства, на котором включено это соединение. Эта возможность известна как "
 "клонирование MAC-адреса или подмена (spoofing). Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC-адрес"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "HW-адрес"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "недопустимый %s для %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "недопустимый %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "недопустимое имя интерфейса для %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "недопустимое имя интерфейса (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "не удалось разобрать имя устройства"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "недопустимый аппаратный адрес"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "недопустимый %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "устройство"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "недопустимый %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Использовать Data Center Bridging (DCB) для этого соединения"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Управление потоком"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Свойство"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Включить"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Извещение"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Готовый"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Параметры…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Группы приоритетов"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Структура"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Управление приоритетом потока"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Включить или выключить приоритет приостановки передачи для каждого "
 "пользовательского приоритета."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Класс трафика"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Строгая полоса пропускания"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Приоритет полосы пропускания"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Группа полосы пропускания"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "ID группы"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Введите идентификатор группы приоритетов для каждого приоритета пользователя."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1625,37 +1701,37 @@ msgstr ""
 "Введите процент разрешенной полосы пропускания, который может использовать "
 "каждая Приоритетная группа. Сумма всех групп должна составлять 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Введите процент полосы пропускания приоритетной группы, которую может "
 "использовать каждый пользовательский приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Включение или отключение строгой пропускной способности для каждого "
 "приоритета пользователя."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Введите класс трафика для каждого приоритета пользователя."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "_Имя пользователя"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 "Имя пользователя, используемое для аутентификации с помощью службы PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1663,53 +1739,51 @@ msgstr ""
 "Только инициировать сеансы с концентраторами доступа, которые предоставляют "
 "указанную услугу. Для большинства поставщиков это должно быть пустым."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "С_лужба"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Пока_зывать пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Пароль, используемый для аутентификации с помощью службы PPPoE."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "_Интерфейс PPP"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Родительский интерфейс"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Произвольное имя для назначения только что созданному PPP-интерфейсу."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Интерфейс, на котором будет установлено соединение PPP."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "_Заявленный интерфейс"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1717,138 +1791,131 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматический"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Витая пара (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Интерфейс подключаемого модуля (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Независимый медиа-интерфейс (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Мбит/c"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Мбит/c"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Гбит/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Гбит/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Половина"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Полный"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Вручную"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Порт"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Устройство"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "_Клонированный MAC-адрес"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Пробуждение по локальной сети"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "По у_молчанию"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Игнорировать"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Пароль пробуждения по локальной сети"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Пароль Wake-on-LAN (Ethernet MAC). Он действителен только для магических "
 "пакетов."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1859,11 +1926,11 @@ msgstr ""
 "устройства. Если вы не уверены, оставьте здесь «Игнорировать» или выберите "
 "«Автоматически»."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Скорость"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1874,11 +1941,11 @@ msgstr ""
 "Прежде чем указывать значение скорости, убедитесь, что ваше устройство "
 "поддерживает его."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "_Дуплекс"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1889,31 +1956,31 @@ msgstr ""
 "Прежде чем указывать дуплексный режим, убедитесь, что ваше устройство "
 "поддерживает его."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Нет"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Все _пользователи могут подключаться к этой сети"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Автоматически подключаться к _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "_Зона межсетевого экрана"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "_Измеренное соединение"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1921,11 +1988,11 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Подключаться _автоматически с приоритетом"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1935,7 +2002,7 @@ msgstr ""
 "высокими номерами предпочтительнее при выборе профилей для автоматической "
 "активации. Значение по умолчанию - 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1944,7 +2011,7 @@ msgstr ""
 "чтобы добавить статический IP-адрес настроенный в дополнение к "
 "автоматическому."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1956,126 +2023,125 @@ msgstr ""
 "добавить IP-адрес. Если адрес не указан, диапазон будет определяться "
 "автоматически."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Дополнительные статические адреса"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Адрес (опционально)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Дейтаграмма"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Подключено"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "_Транспортный режим"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Имя устройства"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Родительское устройство"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Режим"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Локальный IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Удалённый IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Ключ ввода"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Ключ вывода"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматический, с ручными параметрами DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Локальная связь"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Общий с другими компьютерами"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Метод"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2085,8 +2151,8 @@ msgstr ""
 "настройки вашего компьютера. Если хотите использовать идентификатор клиента "
 "DHCP, введите его здесь."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2094,25 +2160,23 @@ msgstr ""
 "Домены, используемые для разрешения имён узлов. Можно указать несколько "
 "доменов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "ID _клиента DHCP"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "_Поисковый домен"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "Серверы _DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2120,11 +2184,11 @@ msgstr ""
 "IP-адреса DNS-серверов используются для разрешения имён узлов. Можно указать "
 "несколько DNS-серверов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Требовать адресацию IPv_4 для этого соединения"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2132,34 +2196,34 @@ msgstr ""
 "При подключении к сетям с возможностями IPv6: разрешает установить "
 "соединение в случае сбоя конфигурации IPv4, но успеха конфигурации IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Маршруты…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Выключено"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Включено (предпочитать открытый адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Включено (предпочитать временный адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Стабильная конфиденциальность"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2169,19 +2233,19 @@ msgstr ""
 "несколько DNS-серверов через запятую. Адреса локальной связи будут "
 "автоматически привязаны к интерфейсу подключения."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "Расширения _конфиденциальности IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "Режим генерации IPv6-адресов"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Требовать адресацию IPv_6 для этого соединения"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2189,28 +2253,28 @@ msgstr ""
 "При подключении к сетям с возможностями IPv4: разрешает установить "
 "соединение в случае сбоя конфигурации IPv6, но успеха конфигурации IPv4."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Проверить"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Строгий"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Имя устройства MACsec."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2218,7 +2282,7 @@ msgstr ""
 "Имя родительского интерфейса или UUID родительского соединения, из которого "
 "должен быть создан этот интерфейс MACSEC."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2226,15 +2290,15 @@ msgstr ""
 "Имя родительского интерфейса или UUID родительского соединения, из которого "
 "должен быть создан этот интерфейс MACsec"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Предварительно разделенное имя ключа подключения"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Предварительно разделенный ключ ассоциации подключения"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2244,202 +2308,202 @@ msgstr ""
 "(соглашение о ключах MACsec). Для режима EAP заполните параметры на странице "
 "безопасности 802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Ключи"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Параметры"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Проверка"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "Порт SCI"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Определяет режим проверки для входящих кадров"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Необходимо ли шифровать передаваемый трафик"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Компонент порта SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Основной"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "_Номер"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Идентификатор с_ети"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Изменить…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Включать _роуминг, если домашняя сеть недоступна"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "По_казывать пароли"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Разрешённые методы"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Настроить _методы…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Сжатие"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Использовать ши_фрование MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Требовать 128-битное _шифрование"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Использовать MPPE с _состояниями"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Разрешить сжатие _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Разрешить сжатие _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Использовать сжатие _заголовков TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Эхо"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Посылать _эхо-пакеты PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Нет"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Только для браузера"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Используйте эту конфигурацию прокси-сервера только для клиентов или схем "
 "браузера."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "Скрипт PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL, с которого должен быть получен сценарий PAC."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Импортировать скрипт из файла…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Метод"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Дополнительно…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Устанавливается мастером"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Состояние порта Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Дополнительные параметры агрегации (team)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "ID _очереди"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2447,20 +2511,20 @@ msgstr ""
 "Количество всплесков незапрашиваемых НС и безвозмездных пакетов ARP, "
 "отправленных после того, как порт включен или отключен."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ID очереди, к которой должен быть привязан этот порт."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Параметры резервного копирования Active-Backup"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Приоритет порта"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2468,32 +2532,32 @@ msgstr ""
 "Значение - положительное число в миллисекундах. Задает интервал между "
 "пакетами пакетов уведомлений-одноранговых узлов."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Приоритет порта. Чем выше число, тем выше приоритет."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _sticky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Варианты бегунов LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "_Приоритет порта LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "_Ключ порта LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2501,7 +2565,7 @@ msgstr ""
 "Количество всплесков повторных запросов групповой группы, отправленных после "
 "того, как порт включен или отключен."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2509,8 +2573,8 @@ msgstr ""
 "Приоритет порта в соответствии со стандартом LACP. Более низкое значение "
 "означает более высокий приоритет."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2518,7 +2582,7 @@ msgstr ""
 "Значение - положительное число в миллисекундах. Задает интервал между "
 "очередями запросов повторного набора групповой адресации."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2526,48 +2590,48 @@ msgstr ""
 "Порт в соответствии со стандартом LACP. Только объединить порты с одним и "
 "тем же ключом."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Задержка _установки соединения"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Задержка _разрыва соединения"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "_Интервал отправки"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Исходный узел"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "_Целевой узел"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2575,8 +2639,8 @@ msgstr ""
 "Максимальное количество пропущенных ответов. Если это число превышено, "
 "ссылка отображается как вниз."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2584,8 +2648,8 @@ msgstr ""
 "Имя хоста, которое должно быть преобразовано в IP-адрес, который будет "
 "заполнен в ARP-запрос в качестве исходного адреса."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2593,13 +2657,13 @@ msgstr ""
 "Имя хоста для преобразования в IP-адрес, который будет заполняться в "
 "качестве адреса назначения."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Игнорировать недействительные пакеты из _active портов"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2607,13 +2671,13 @@ msgstr ""
 "Проверять полученные ARP-пакеты на активных портах. Если это не проверено, "
 "все входящие пакеты ARP будут считаться хорошим ответом."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Игнорировать недопустимые пакеты из i_nactive портов"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2621,13 +2685,13 @@ msgstr ""
 "Проверять полученные ARP-пакеты на неактивных портах. Если это не проверено, "
 "все входящие пакеты ARP будут считаться хорошим ответом."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "S_end на неактивных портах"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2635,157 +2699,156 @@ msgstr ""
 "По умолчанию запросы ARP отправляются только на активные порты. Этот "
 "параметр позволяет отправлять даже на неактивные порты."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Интервал между отправленными запросами."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "Задержка между инициализацией часов связи и отправкой первого запроса."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Наблюдатель канала, который будет использоваться."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Ссылка Watcher"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "И_мпортировать параметры агрегированного соединения (team) из файла…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Редактировать _конфигурацию JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Необработанная конфигурация"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Наивысший приоритет"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Наивысший приоритет (стабильный)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Полоса пропускания"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Наибольшее количество портов"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Приоритет порта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "От team-устройства"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "От активного порта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "От активного team-устройства"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "_Агрегированные соединения (team)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Балансировка нагрузки"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Любой протокол L3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Любой протокол L4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Аппаратный адрес"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2793,19 +2856,19 @@ msgstr ""
 "Желаемый аппаратный адрес нового командного устройства. Обычный формат MAC-"
 "адреса принимается."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "_Политика аппаратных адресов"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Имя используемого бегуна."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2814,11 +2877,11 @@ msgstr ""
 "портовых устройств должны быть установлены в течение всего жизненного цикла "
 "команды."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Отправлять кадры LACPDU _периодически"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2826,11 +2889,11 @@ msgstr ""
 "Если отмечено, кадры LACPDU периодически отправляются по настроенным "
 "ссылкам. Если нет, он действует как «говорить, когда говорят»."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Отправить рамку LACPDU"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2841,23 +2904,23 @@ msgstr ""
 "один раз в секунду. В противном случае они будут отправляться каждые 30 "
 "секунд."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Системный приоритет"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Системный приоритет, значение может быть 0 - 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2865,11 +2928,11 @@ msgstr ""
 "Указывает минимальное количество портов, которые должны быть активны, до "
 "того, как заявить несущую в главном интерфейсе, значение может быть 1 - 255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Это выбирает политику выбора агрегаторов."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2877,185 +2940,181 @@ msgstr ""
 "Список типов фрагментов (строк), которые должны использоваться для пакетного "
 "вычисления хеша Tx."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Fields для передачи хэш"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "В десятые доли секунды. Периодический интервал между перебалансировкой."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Название активного балансира Tx. Активная балансировка Tx по умолчанию "
 "отключена."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Интервал _балансировки Transmission"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Б_алансировщик Transmission"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "полоз"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Родительский интерфейс"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "_Имя интерфейса VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "_Клонированный MAC-адрес"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "_Идентификатор VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Флаги"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Переупорядочить заголовки"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Новое связывание"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Имя устройства + номер"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + номер"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "_Безопасность"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Клиент"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Точка доступа"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Мо_щность передачи"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Мбит/c"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Скорость"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Канал"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "_Диапазон"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Нет разрешения polkit для выполнения действия"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Разрешённые методы аутентификации"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "_CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol версии 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3064,182 +3123,176 @@ msgstr ""
 "аутентификации. Если же соединение не устанавливается, попробуйте выключить "
 "поддержку некоторых методов."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP-туннель"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Отсутствует тип VPN сервиса."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr "Модулю VPN не удалось правильно импортировать VPN-соединение: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Выбор файла для импортирования"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "О_ткрыть"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Физическое"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Логическое"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Импортировать сохранённую конфигурацию VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Не удалось создать диалог редактора соединений из-за внутренней ошибки."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не удалось создать новое соединение"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Не удалось удалить соединение"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Удалить соединение «%s»?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Создать соединение"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Завершить"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Маска сети"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Изменение %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Изменение безымянного соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Отсутствует имя соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Инициализация редактора…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Невозможно изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Недопустимая настройка %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3247,34 +3300,34 @@ msgstr ""
 "Редактор соединений не может найти некоторые необходимые ресурсы (не найден "
 "файл .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Сохранить параметры соединения."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Введите пароль администратора для того, чтобы сделать это соединение общим "
 "для всех пользователей компьютера."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Не удалось создать соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не удалось изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ошибка создания диалога для изменения соединений."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3282,19 +3335,19 @@ msgstr ""
 "Предупреждение: соединение содержит некоторые свойства, не поддерживаемые "
 "редактором. Они будут очищены после спасения."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Ошибка инициализации редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Сбой добавления соединения"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Исправить"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3302,23 +3355,23 @@ msgstr ""
 "Метки безопасности могут предотвращать использование некоторых файлов при "
 "аутентификации сертификатом."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "_Имя соединения"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Экспортировать…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Сменить метку файла"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Сменить метку"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3326,25 +3379,25 @@ msgstr ""
 "Следующие файлы не помечены для использования с аутентификацией сертификата. "
 "Вы хотите настроить ярлыки?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Сменить метку"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "никогда"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "сейчас"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3352,7 +3405,7 @@ msgstr[0] "%d минута назад"
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3360,7 +3413,7 @@ msgstr[0] "%d час назад"
 msgstr[1] "%d часа назад"
 msgstr[2] "%d часов назад"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3368,7 +3421,7 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дня назад"
 msgstr[2] "%d дней назад"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3376,7 +3429,7 @@ msgstr[0] "%d месяц назад"
 msgstr[1] "%d месяца назад"
 msgstr[2] "%d месяцев назад"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3384,159 +3437,158 @@ msgstr[0] "%d год назад"
 msgstr[1] "%d года назад"
 msgstr[2] "%d лет назад"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Соединение нельзя удалить"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Выберите соединение для редактирования"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Выберите соединение для удаления"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Последнее использование"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Изменить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Для изменения выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Удалить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Для удаления выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Нераспознанный тип соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Неизвестно, как импортировать соединения «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Ошибка импорта соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Ошибка создания соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Тип соединения не указан."
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Модули VPN не установлены."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Неизвестно, как создавать соединения «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Ошибка изменения соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Соединение с UUID «%s» не найдено"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "Сетевые соединения"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Добавить новое соединение"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Безопасность 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс безопасности 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Использовать безопасность 802.1_X для этого соединения"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAC-адрес устройства Bluetooth. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "недопустимое устройство Bluetooth (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Соединение Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Тип Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Выберите тип профиля подключения Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Персональная сеть"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Сеть _Dial-Up"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс агрегированного соединения "
 "(bond)."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "основной"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Агрегированное соединение (bond) %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс соединения типа мост."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Соединение типа мост %d"
@@ -3544,37 +3596,37 @@ msgstr "Соединение типа мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс порта соединения типа мост."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс DCB."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс DSL."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "отсутствуют родительский интерфейс"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Соединение DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3584,41 +3636,40 @@ msgstr ""
 "его именем интерфейса, либо постоянным MAC-адресом, либо тем и другим "
 "одновременно. Примеры: «em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "игнорируется"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Устройство Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "клонированный MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Пароль пробуждения по локальной сети"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Соединение Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3628,11 +3679,11 @@ msgstr ""
 "является зоной общего пользования, выбрав эту зону, вы установите её в "
 "межсетевом экране. Работает только при включённом firewalld."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс общих параметров."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3645,166 +3696,158 @@ msgstr ""
 "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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "устройство infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Соединение InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс туннелирования IP."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Туннельное IP-соединение %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Автоматический (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматический (VPN, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Автоматический, только адреса"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Автоматический (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматический (PPPoE, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Автоматический (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматический (DHCP, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Только для локальной связи"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "_Дополнительные серверы DNS"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "До_полнительные поисковые домены"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Редактирование маршрутов IPv4 для %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Параметры IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4-адрес «%s» недействителен"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Сетевая маска IPv4-адреса «%s» недействительна"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4-шлюз «%s» недействителен"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "DNS-сервер IPv4 «%s» недействителен"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Автоматический, только DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Параметры IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6-адрес «%s» недействителен"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Префикс IPv6 «%s» недействителен"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6-шлюз «%s» недействителен"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "DNS-сервер IPv6 «%s» недействителен"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс MACsec."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "Соединение MACSEC %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Дублирующиеся слейвы"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Слейвы «%s» и «%s» оба относятся к устройству «%s»"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3813,25 +3856,25 @@ msgstr ""
 "Слейвы «%s» и «%s» относятся к разным виртуальным портам («%s» и «%s») "
 "одного физического устройства."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s слейв %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс мобильной связи."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Указанный тип соединения мобильной связи не поддерживается."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Выберите тип оператора мобильной связи"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3839,88 +3882,86 @@ msgstr ""
 "Выберите предоставляемый оператором тип мобильной связи. Если не уверены, "
 "обратитесь к оператору."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Оператор использует технологию _GSM (GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Оператор использует технологию _CDMA (1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "нет"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Методы PPP-аутентификации для %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Параметры PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс PPP."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс proxy."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Ошибка: файл не содержит конфигурации JSON"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс агрегированного соединения "
 "(team)."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Агрегированное соединение (team) %d"
@@ -3928,11 +3969,11 @@ msgstr "Агрегированное соединение (team) %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Порт агрегации (team)"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс порта агрегации (team)."
@@ -3940,57 +3981,56 @@ 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (посредством «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Создать соединение…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс vlan."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "родительский vlan"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Соединение VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не удалось загрузить модуль редактора VPN для «%s» (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "неизвестный сбой"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс VPN."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Не удалось найти модуль VPN для «%s»."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-соединение %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Выберите тип VPN-соединения"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3999,7 +4039,7 @@ msgstr ""
 "Выберите тип VPN для использования в новом соединении. Если необходимый тип "
 "отсутствует в списке, то возможно, не установлен необходимый VPN-модуль."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4007,7 +4047,7 @@ msgstr ""
 "Эта опция закрепляет это соединение к беспроводной точке доступа, указанной "
 "по идентификатору BSSID. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4018,95 +4058,93 @@ msgstr ""
 "одновременно. Примеры: «wlan0», «3C:97:0E:42:1A:19», «wlan0 "
 "(3C:97:0E:42:1A:19)»"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Устройство Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP (40/128-битный ключ (Hex или ASCII))"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамический WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi; "
 "отсутствуют параметры Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Защита Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс безопасности Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "отсутствует SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Безопасность несовместима с режимом Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Файл с именем «%s» уже существует."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Заменить %s сохраняемым VPN-соединением?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не удалось экспортировать VPN-соединение"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4117,116 +4155,103 @@ msgstr ""
 "\n"
 "Ошибка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Экспортировать VPN-соединение…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Разблокировать"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Разблокировать это устройство автоматически"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Сведения о текущем соединении"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Активные сетевые соединения"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Сертификатов не установлено"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Нет установленного ключа"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Выбрать ключ для сертификата %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "Приватный _ключ %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "_Пароль приватного ключа %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Выбрать сертификат %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "_Сертификат %s"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Моей страны нет в списке"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Нет в списке"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Моего тарифного плана нет в списке…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Оператор"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Страна или регион"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Установленное GSM-устройство"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Установленное CDMA-устройство"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Любое устройство"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Новое соединение мобильной связи"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4234,84 +4259,70 @@ msgstr ""
 "Мастер подключения поможет настроить соединение мобильной связи к сотовой "
 "сети 3G."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Необходимо знать следующие сведения:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Название оператора мобильной связи"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Название тарифного плана мобильной связи"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "Имя точки доступа (APN) тарифного плана мобильной связи (в некоторых случаях)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Создать соединение для _этого устройства мобильной связи:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройка соединения мобильной связи"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Список стран и регионов:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Страна или регион"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Выберите страну или регион оператора"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Выбор оператора из _списка:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "_Указать оператора вручную:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Оператор использует технологию GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Оператор использует технологию CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Выберите оператора"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Выберите тарифный план:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Выберите точку доступа (APN) этого тарифного плана:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4324,37 +4335,31 @@ msgstr ""
 "Если не уверены, какой тарифный план выбрать, уточните APN у оператора "
 "мобильной связи."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Выберите тарифный план"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Соединение мобильной связи настроено со следующими параметрами:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Устройство:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Оператор:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Тарифный план:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4367,175 +4372,174 @@ msgstr ""
 "ресурсам, попробуйте изменить параметры. Чтобы изменить параметры соединения "
 "мобильной связи, выберите «Сеть» в Параметрах системы."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Подтвердить параметры мобильной связи"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Нет)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Ключ в %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Сертификат в %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Неизвестно)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Выбрать из файла…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Выбрать сертификат %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "Пароль сертификата %s"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Ошибка авторизации: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Ошибка открытия сессии: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Разблокировать токен"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Используется"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Введите PIN %s"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Логин"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Запомнить PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Запомнить пароль только для этого пользователя"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Запомнить пароль для всех пользователей"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Запрашивать этот пароль каждый раз"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Пароль не требуется"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "По_казывать пароли"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Третий пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Второй пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Нажмите для подключения"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Создать…"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Нет"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамический WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Сеть Wi-Fi требует аутентификацию"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Создать новую сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Новая сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введите имя для создаваемой сети Wi-Fi."
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Подключение к скрытой сети Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Скрытая сеть Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4543,43 +4547,51 @@ msgstr ""
 "Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
 "необходимо подключиться."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "_Безопасность Wi-Fi"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "Сое_динение"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "_Адаптер Wi-Fi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "_Указать оператора вручную:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Оператор:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Список стран и регионов:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Страна или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Проводная"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4589,13 +4601,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4603,27 +4615,27 @@ msgstr ""
 "Отсутствует пароль или соединение некорректно. В последнем случае сначала "
 "нужно отредактировать соединение с помощью nm-connection-editor"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "_Безопасность Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Имя сети:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "Сое_динение:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "_Адаптер Wi-Fi:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Использование:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4631,7 +4643,7 @@ msgstr ""
 "Эта программа является частью NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4639,339 +4651,337 @@ msgstr ""
 "Она не предназначена для использования из командной строки, её следует "
 "запускать из рабочей среды GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "не включён"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не зарегистрирован"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашняя сеть (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Домашняя сеть"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "идёт поиск"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "отказано в регистрации"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (роуминг %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роуминговая сеть (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Роуминговая сеть"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-код для SIM-карты «%s» на «%s»"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Требуется PIN-код"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Для устройства мобильной связи требуется PIN-код"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Соединение мобильной связи «%s» активно: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Подключение %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Сертификаты PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Секретные ключи DER, PEM или PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "не выбран сертификат УЦ"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "выбранный файл сертификата УЦ не существует"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "отсутствует файл EAP-FAST PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Выбрать файл PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимная"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "С проверкой подлинности"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Обе"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "А_нонимная аутентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "_Файл PAC"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "_Внутренняя аутентификация"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Разрешить автоматическую инициализацию PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "отсутствует имя пользователя EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "отсутствует пароль EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Версия 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Сертификат УЦ не _требуется"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "_Версия PEAP"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Суффикс имени сертификата сервера."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Домен"
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "отсутствует имя пользователя EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "отсутствует пароль EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "По_казывать пароли"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "отсутствует идентичность EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "не выбран сертификат пользователя"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "выбранный файл сертификата пользователя не существует"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "ключи не выбраны"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "выбранный файл ключа не существует"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "_Подлинность"
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (без EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Неизвестная ошибка проверки безопасности 802.1x"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
 # Метод аутентификации
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Туннелированный TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Защищённый EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "А_утентификация"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "отсутствует leap-имя пользователя"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "отсутствует leap-пароль"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "отсутствует wep-ключ"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "недействительный wep-ключ: ключ с длиной %zu должен содержать только "
 "шестнадцатеричные цифры"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4979,7 +4989,7 @@ msgstr ""
 "недействительный wep-ключ: ключ с длиной %zu должен содержать только символы "
 "ASCII"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4988,40 +4998,40 @@ msgstr ""
 "недействительный wep-ключ: ключ с неверной длиной %zu. Ключ должен быть "
 "длины 5/13 (ASCII) или 10/26 (HEX)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "недействительный wep-ключ: парольная фраза не может быть пустой"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "недействительный wep-ключ: парольная фраза должна быть короче 64 символов"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Открытая система"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Общий ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (по умолчанию)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Пока_зывать ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "_Индекс WEP"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5030,16 +5040,25 @@ msgstr ""
 "недействительный wpa-psk: ключ неверной длины %zu. Должен быть [8,63] байт "
 "или 64 шестнадцатеричных цифр"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "недействительный wpa-psk: невозможно интерпретировать ключ с 64 байт как "
 "шестнадцатеричный"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Тип"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (по умолчанию)"
+
+#~ msgid "Ignored"
+#~ msgstr "Игнорируется"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Активные сетевые соединения"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "Сбой обновления ключей соединения из-за неизвестной ошибки."
 
diff --git a/po/rw.po b/po/rw.po
index c666b368..83a73af6 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -14,8 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -25,226 +26,247 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr ""
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "urusobe Ukwihuza"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
-msgid "Network Connections"
+msgid "Advanced Network Configuration"
 msgstr "urusobe Ukwihuza"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "ni OYA"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "urusobe Ukwihuza"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "ni OYA"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr ""
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "Kwihuza"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
-msgstr ""
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
+msgstr "ni OYA"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr ""
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr ""
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr ""
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "Na: Bishunzwe: Bikora"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr ""
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -252,7 +274,7 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -260,14 +282,14 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -275,49 +297,49 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -325,19 +347,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr ""
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr ""
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -346,7 +368,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -355,623 +377,649 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "Kwihuza"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 #, fuzzy
 msgid "Disconnect"
 msgstr "Kwihuza"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 #, fuzzy
 msgid "No network devices available"
 msgstr "urusobe Byabonetse"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr ""
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr ""
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "ni OYA"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr ""
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr ""
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr ""
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr ""
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 #, fuzzy
 msgid "_About"
 msgstr "Bigyanye"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr ""
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kwihuza"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr ""
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Kuri urusobe"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Kuri urusobe"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 #, fuzzy
 msgid "No network connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 #, fuzzy
 msgid "Connection Established"
 msgstr "Na: Bishunzwe: Bikora"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Kuri"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Kuri urusobe"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:225
+# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+#, fuzzy
+msgid "_OK"
+msgstr "YEGO"
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Kuri a urusobe"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Gishya"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Kuri"
 msgstr[1] "Kuri"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "urusobe"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Kuri urusobe"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr ""
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr ""
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr ""
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr ""
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr ""
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+msgid "Primary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Secondary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr ""
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr ""
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr ""
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr ""
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+msgid "Security"
 msgstr ""
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr ""
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+msgid "Password"
 msgstr ""
 
 # #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
 # sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
 # #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
 # sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "Ubwoko bw'agakandisho"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr ""
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr ""
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr ""
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 #, fuzzy
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "ni OYA"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -979,25 +1027,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1005,91 +1053,95 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#, fuzzy
-msgid "_OK"
-msgstr "YEGO"
+#: src/applet-vpn-request.c:408
+msgid "Connection had no VPN setting"
+msgstr ""
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1097,637 +1149,778 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+msgid "_Interface name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+msgid "_Primary"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+msgid "_Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
 # basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 #, fuzzy
 msgid "s"
 msgstr "%s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr ""
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+msgid "_Username"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+msgid "_Password"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:116
+msgid "PPP _interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:130
+msgid "P_arent interface"
 msgstr ""
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+msgid "C_laim interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+msgid "C_loned MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+msgid "_Wake on LAN password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+msgid "_Speed"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Na: Bishunzwe: Bikora"
+msgid "_Metered connection"
+msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1735,1367 +1928,1512 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "Kwihuza"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+msgid "_Method"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+msgid "N_etwork ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "Icyerekezo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+msgid "Allowed methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+msgid "Method"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Kuri"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+msgid "_LACP port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
-msgstr ""
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
+msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+msgid "_Hardware Address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+msgid "_Hardware address policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+msgid "_Parent interface"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+msgid "VLAN inter_face name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+msgid "Cloned MAC _address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+msgid "S_ecurity"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-#, fuzzy
-msgid "Cannot import VPN connection"
-msgstr "urusobe Ukwihuza"
-
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
-msgstr ""
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
+msgstr "urusobe Ukwihuza"
 
 # offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "Ibyerekeye"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Na: Bishunzwe: Bikora"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 #, fuzzy
 msgid "Edit the selected connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Na: Bishunzwe: Bikora"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+#, fuzzy
+msgid "Network Connections"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Kuri"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Kuri"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "urusobe Ukwihuza"
@@ -3103,84 +3441,87 @@ msgstr "urusobe Ukwihuza"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+msgid "missing parent interface"
+msgstr ""
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "urusobe Ukwihuza"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3188,269 +3529,266 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr ""
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr ""
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "urusobe Ukwihuza"
@@ -3458,175 +3796,173 @@ msgstr "urusobe Ukwihuza"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
+#: src/connection-editor/page-vpn.c:64
+#, c-format
+msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
+#: src/connection-editor/page-vpn.c:65
+msgid "unknown failure"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:122
-#, c-format
-msgid "Could not load editor VPN plugin for “%s” (%s)."
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
-msgid "unknown failure"
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3634,458 +3970,435 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr ""
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "urusobe Ukwihuza"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr ""
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "urusobe Ukwihuza"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr ""
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Gishya"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kuri a urusobe"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "Kwihuza"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4095,421 +4408,433 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Kwihuza"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "Kugena urusobe"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "Kuri"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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 ""
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
+msgstr "Icyerekezo"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "No CA certificate is _required"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
-msgid "missing EAP username"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
-msgid "missing EAP password"
+#: src/wireless-security/eap-method-simple.c:90
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
-msgid "missing EAP-TLS identity"
+#: src/wireless-security/eap-method-simple.c:106
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
-msgid "no user certificate selected"
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:243
-msgid "selected user certificate file does not exist"
+#: src/wireless-security/eap-method-simple.ui:103
+msgid "P_rivate Key Passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
-msgid "no key selected"
+#: src/wireless-security/eap-method-simple.ui:128
+msgid "Sh_ow passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
-msgid "selected key file does not exist"
+#: src/wireless-security/eap-method-tls.c:64
+msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
+#: src/wireless-security/eap-method-tls.c:256
+msgid "no user certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
+#: src/wireless-security/eap-method-tls.c:261
+msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.c:281
+msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
+#: src/wireless-security/eap-method-tls.c:286
+msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-tls.ui:20
+msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
+msgstr "Icyerekezo"
+
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr ""
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr ""
+
+#: src/wireless-security/ws-wep-key.ui:54
+msgid "_Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
@@ -4517,12 +4842,20 @@ msgstr ""
 # sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
 # #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
 # sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
-msgid "_Type:"
+msgid "_Type"
 msgstr "Ubwoko bw'agakandisho"
 
 #, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Na: Bishunzwe: Bikora"
+
+#, fuzzy
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "urusobe Ukwihuza"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "ni OYA"
 
diff --git a/po/sk.po b/po/sk.po
index ca47af6e..fabaf1af 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-10-26 09:52+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-10-28 11:57+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
@@ -23,57 +23,64 @@ msgstr ""
 "X-Generator: Poedit 2.2\n"
 
 # desktop entry name
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Sieť"
 
 # dektop entry comment
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Spravuje vaše sieťové pripojenia"
 
-# desktop entry name
-# GtkDialog title
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Sieťové pripojenia"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Aktívne sieťové pripojenia"
 
 # dektop entry comment
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Spravuje a mení nastavenia vášho sieťového pripojenia"
 
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Zakázať oznámenia o pripojení"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Nastavte na true, keď chcete zakázať oznámenia počas pripájania k sieti."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Zakázať oznámenia o odpojení"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Nastavte na true, keď chcete zakázať oznámenia počas odpájania zo siete."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Zakázať oznámenia o pripojení VPN"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -82,56 +89,57 @@ msgstr ""
 "odpájania z VPN."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Potlačiť oznámenia dostupných sietí"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Nastavte na true, keď chcete zakázať oznámenia na dostupné Wi-Fi siete."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Známka"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Použité na zistenie, či majú byť nastavenia migrované na novú verziu."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Zakázať vytváranie Wi-Fi"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Nastavte na true, keď chcete zakázať vytváranie ad-hoc sietí pri používaní "
 "apletu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Zobraziť aplet v oblasti oznámení"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Nastavte na false, keď nechcete aby sa zobrazoval aplet v oblasti oznámení."
 
 # gsettings summary
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorovať certifikát CA"
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -140,7 +148,7 @@ msgstr ""
 "certifikačnej autority pri overovaní totožnosti protokolom EAP."
 
 # gsettings description
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -148,15 +156,15 @@ msgstr ""
 "Nastavte na true, keď chcete zakázať upozornenia o certifikátoch "
 "certifikačnej autority v 2. fáze pri overovaní totožnosti protokolom EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Editor pripojení správcu siete NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -164,7 +172,7 @@ msgstr ""
 "NetworkManager je systémová služba na správu a nastavenie vašich sieťových "
 "pripojení a zariadení."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -172,37 +180,37 @@ msgstr ""
 "Program nm-connection-editor spolupracuje so správcom siete NetworkManager "
 "na vytváranie a úpravu sieťových profilov pre NetworkManager."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Vývojári správcu siete NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -210,84 +218,82 @@ msgid ""
 msgstr ""
 
 # GtkDialog title
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Overenie totožnosti protokolom 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1068
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Prip_ojiť"
 
 # GtkLabel label
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-#| msgid "_Network name:"
 msgid "_Network name"
 msgstr "_Názov siete:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "zabezpečenie."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Zlyhalo pridanie/aktivovanie pripojenia"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Pripojenie zlyhalo"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Odpojenie zariadenia zlyhalo"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Odpojenie zlyhalo"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivácia pripojenia zlyhala"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Túto správu viac nezobrazovať"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +304,7 @@ msgstr ""
 "Pripojenie k VPN „%s“ bolo odpojené, pretože sieťové pripojenie bolo "
 "prerušené."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +314,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sieťové pripojenie bolo prerušené."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +323,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože služba VPN neočakávane skončila."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -328,7 +334,7 @@ msgstr ""
 "Pripojenie k VPN „%s“ zlyhalo, pretože služba VPN vrátila neplatnú "
 "konfiguráciu."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +343,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože vypršal čas pre pokus o pripojenie."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -346,7 +352,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sa služba VPN nespustila načas."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -355,7 +361,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sa služba VPN nespustila."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -364,7 +370,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože neboli nájdené platné heslá pre VPN."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -373,7 +379,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo pre neplatné VPN heslá."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -382,7 +388,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -393,19 +399,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Pripojenie k VPN bolo úspešne nadviazané.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Správa o prihlásení k VPN"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Zlyhanie pripojenia k VPN"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -418,7 +424,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -431,579 +437,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "zariadenie nepripravené (chýba firmvér)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "zariadenie nepripravené"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "odpojené"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Odpojiť"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "zariadenie nespravované"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Neboli nájdené sieťové zariadenia"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Pripojenia k _VPN"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Konfigurovať VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Pridať pripojenie k VPN…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Správca siete nie je spustený…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Sieť deaktivovaná"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Povoliť _sieť"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Povoliť _bezdrôtové pripojenie"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Povoliť _mobilné pripojenie"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Povoliť o_známenia"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Informácie o pripojení"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Upraviť pripojenia…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Teraz ste pripojený k „%s“."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Sieťové pripojenie bolo rozpojené."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Pripravuje sa sieťové pripojenie „%s“…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Sieťové pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Žiada sa sieťová adresa pre „%s“…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Sieťové pripojenie „%s“ je aktívne"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Spúšťa sa pripojenie k VPN „%s“…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Pripojenie k VPN „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Žiada sa adresa VPN pre „%s“…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Pripojenie k VPN je aktívne"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Bez sieťového pripojenia"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet Správca siete"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Nesprávny kód PUK; prosím kontaktuje vášho poskytovateľa."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Nesprávny kód PIN; prosím kontaktuje vášho poskytovateľa."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Odosiela sa kód odomknutia…"
 
 # PM: nepáči sa mi že podstatné meno prekladáš prídavným, mobile broadband sa zvykne prekladať ako mobilá širokopásmová sieť, takže aspoň Mobilná sieť
 # PK: tu ide o pripojenie
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilné (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilné"
 
 # to je o sieťach
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dostupné"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Nové mobilné pripojenie…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Pripojené"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Teraz ste pripojený k mobilnej sieti."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilná sieť"
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Teraz ste registrovaný v domácej sieti."
 
 # PM: prečo nie v roamingovej? Ak sa ti to nevidí opýtaj sa v JULS
 # PK: okay, toto znie lepsie, roaming ale ponecham
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Teraz ste registrovaný v roamingovej sieti."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Teraz ste pripojený k mobilnej sieti."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Pripravuje sa mobilné pripojenie „%s“…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Nastavuje sa mobilné pripojenie „%s“…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Mobilné pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobilné pripojenie „%s“ je aktívne"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatický ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Siete ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Sieť ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Siete ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Sieť ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Teraz ste pripojený k sieti ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Pripravuje sa sieťové pripojenie ethernet „%s“…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Nastavuje sa sieťové pripojenie ethernet „%s“…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 "Pripojenie k sieti ethernet „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Žiada sa sieťová adresa pre sieť ethernet „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Pripojenie k sieti ethernet „%s“ je aktívne"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Overenie totožnosti k DSL"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_OK"
 
 # dialog title
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Pripojiť k skrytej sieti Wi-Fi…"
 
 #  window title
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Vytvoriť _novú sieť Wi-Fi…"
 
 # ssid
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(žiadne)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Zlyhalo pridanie nového pripojenia"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Siete Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Sieť Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Siete Wi-Fi"
 msgstr[1] "Sieť Wi-Fi"
 msgstr[2] "Siete Wi-Fi"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Sieť Wi-Fi je zakázaná"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Sieť Wi-Fi je zakázaná hardvérovým vypínačom"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Ďalšie siete"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupné siete Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Na pripojenie k sieti Wi-Fi použite ponuku sietí"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Teraz ste pripojený k sieti Wi-Fi „%s“."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Pripravuje sa sieťové pripojenie k Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Nastavuje sa sieťové pripojenie k Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Sieť Wi-Fi „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Žiada sa sieťová adresa Wi-Fi pre „%s“…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Sieťové pripojenie k Wi-Fi „%s“ je aktívne: %s (%d %%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Pripojenie k sieti Wi-Fi „%s“ je aktívne"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Zlyhala aktivácia pripojenia"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Chyba pri zobrazovaní informácií o pripojení:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamické WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Viac adries"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (predvolené)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Neznáma"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Adresa IP"
 
 # všesmerového vysielania?
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresa všesmerového vysielania"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Maska podsiete"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primárne:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Sekundárny DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Ternárny DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardvérová adresa"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Ovládač"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Rýchlosť"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Zabezpečenie:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Predvolené smerovanie"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorované"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Aktívny bod"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Heslo:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Typ VPN"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Brána VPN"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Používateľské meno k VPN"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Úvodný text VPN"
 
 # MČ: Skôr by som bol za základné pripojenie, malo by to vyjadrovať rozhranie, cez ktoré je vytvoréná VPN. „parent_con = get_connection_for_active_path ...“
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Základné pripojenie"
 
 # base connection, device type
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neznáme"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Žiadne platné aktívne sieťové pripojenie!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 #, fuzzy
-#| msgid ""
-#| "Copyright © 2004-2014 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1013,22 +1027,22 @@ msgstr ""
 "Autorské práva © 2005-2008 Novell, Inc.\n"
 "a veľa ďalších prispievateľov a prekladateľov z komunity"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet do oblasti upozornení pre správu sieťových zariadení a pripojení."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Webové stránky pre program Správca siete"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 
 # warning dialog
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1036,35 +1050,35 @@ msgstr ""
 "Aplet Správca siete nemohol nájsť niektoré vyžadované zdroje (súbor .ui "
 "nebol nájdený)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Chýbajúce zdroje"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Heslo pre mobilnú sieť"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Na pripojenie k sieti „%s“ je potrebné heslo."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Heslo:"
 
 # window title
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Žiadosť o kód PIN na odomknutie SIM"
 
 # desc
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Vyžaduje sa kód PIN na odomknutie SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1074,27 +1088,27 @@ msgstr ""
 "bude dať použiť."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Kód PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Zobraziť kód PIN"
 
 # window title
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Žiadosť o kód PUK na odomknutie SIM"
 
 # desc
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Vyžaduje sa kód PUK na odomknutie SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1104,44 +1118,42 @@ msgstr ""
 "bude dať použiť."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Kód PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nový kód PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Znova zadajte nový kód PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Zobraziť kódy PIN/PUK"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 #, fuzzy
-#| msgid "Connection Information"
 msgid "Connection had no VPN setting"
 msgstr "Informácie o pripojení"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, fuzzy, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Zlyhalo vytvorenie pripojenia k DUN: %s"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1149,41 +1161,41 @@ msgstr ""
 "Adresy IP identifikujú váš počítač v sieti. Kliknite na tlačidlo „Pridať“ na "
 "pridanie adresy IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norovať automaticky získané smerovania"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Použiť toto prip_ojenie len pre zdroje na jeho vlastnej sieti"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1191,15 +1203,15 @@ msgstr ""
 "Ak je povolené, toto pripojenie nebude nikdy použité ako predvolené sieťové "
 "pripojenie."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "Vytvo_riť…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Voľba typu pripojenia"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1211,100 +1223,103 @@ msgstr ""
 "Ak chcete vytvoriť pripojenie k VPN, ktoré sa nenachádza v zozname, tak by "
 "ste mali skontrolovať, či máte nainštalovaný správny zásuvný modul pre VPN."
 
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Zariadenie"
+
 #  * http://en.wikipedia.org/wiki/Link_aggregation#Linux_Bonding_Driver_Modes
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
 #  aspon jedno pripojenie je pripravene do zalohy
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktívna záloha"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Všesmerové vysielanie"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Prispôsobujúce sa vyrovnávanie záťaže prenosu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Prispôsobujúce sa vyrovnávanie záťaže"
 
 # MII = media independent interface
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (odporúčané)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-#| msgid "Bonded _connections:"
 msgid "Bonded _connections"
 msgstr "Previazané _pripojenia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 #, fuzzy
-#| msgid "M_ode:"
 msgid "M_ode"
 msgstr "R_ežim:"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
-#| msgid "Monitoring _frequency:"
 msgid "Monitoring _frequency"
 msgstr "Monitorovacia _frekvencia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-#| msgid "_Interface name:"
 msgid "_Interface name"
 msgstr "_Názov rozhrania:"
 
 # link layer
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
-#| msgid "_Link Monitoring:"
 msgid "_Link Monitoring"
 msgstr "_Sledovanie linkovej vrstvy:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 #, fuzzy
-#| msgid "ARP _targets:"
 msgid "ARP _targets"
 msgstr "ARP _ciele:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1312,25 +1327,22 @@ msgstr ""
 "Adresa IP alebo zoznam adries IP oddelených čiarkou, ktoré skontrolovať pri "
 "kontrole stavu spojenia"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
-#| msgid "Link _up delay:"
 msgid "Link _up delay"
 msgstr "Oneskorenie _pripojenia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
-#| msgid "Link _down delay:"
 msgid "Link _down delay"
 msgstr "Oneskorenie _odpojenia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-#| msgid "_Primary:"
 msgid "_Primary"
 msgstr "_Primárne:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1338,83 +1350,79 @@ msgstr ""
 "Názov rozhrania primárneho zariadenia. Ak je nastavené, bude toto zariadenie "
 "pri dostupnosti vždy aktívnym podriadeným rozhraním."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
-#| msgid "_MTU:"
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajtov"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 #, fuzzy
-#| msgid "Path _cost:"
 msgid "Path _cost"
 msgstr "Cena _cesty:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-#| msgid "_Priority:"
 msgid "_Priority"
 msgstr "_Priorita:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
-#| msgid "_Hairpin mode:"
 msgid "_Hairpin mode"
 msgstr "Režim _reflexného relé:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-#| msgid "Bridged _connections:"
 msgid "Bridged _connections"
 msgstr "Premostené _pripojenia:"
 
 # The forward delay is the time that is spent in the listening and learning state. This time is equal to 15 sec by default, but you can tune the time to be between 4 and 30 sec.
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
-#| msgid "_Forward delay:"
 msgid "_Forward delay"
 msgstr "Oneskorenie p_reposlania:"
 
 # The hello time is the time between each bridge protocol data unit (BPDU) that is sent on a port. This time is equal to 2 seconds (sec) by default, but you can tune the time to be between 1 and 10 sec.
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
-#| msgid "_Hello time:"
 msgid "_Hello time"
 msgstr "Čas _Hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Povoliť _sieť"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1422,46 +1430,44 @@ msgid ""
 msgstr ""
 
 # PK: toto znie sialene
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Povoliť _STP (protokol kostry grafu)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
-#| msgid "_Max age:"
 msgid "_Max age"
 msgstr "_Maximálna doba:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 #, fuzzy
-#| msgid "_Aging time:"
 msgid "_Aging time"
 msgstr "Čas _starnutia:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1469,41 +1475,41 @@ msgid ""
 "frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automaticky"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "predvolené"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "nešpecifikovaná chyba"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Povoliť"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1514,184 +1520,228 @@ msgstr ""
 "zariadenie s týmto pripojením. Táto funkcia je známa ako klonovanie alebo "
 "podstrkovanie. Príklad: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Hardvérová adresa"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "neplatná adresa %s pre %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, fuzzy, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "neplatný názov rozhrania pre %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "neplatný názov rozhrania (%s)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Hardvérová adresa:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, fuzzy, c-format
 msgid "invalid %s (%s): "
 msgstr "neplatná adresa %s pre %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "zariadenie"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, fuzzy, c-format
 msgid "invalid %s (%s) "
 msgstr "neplatná adresa %s pre %s (%s)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Pre toto pripojenie použiť Data Center Bridging (DCB)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Riadenie toku dát"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funkcia"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Priorita"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Voľby…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Skupiny priorít"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Riadenie toku dát priority"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Povoľte alebo zakážte prioritné pozastavenie vysielania pre každú "
 "používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Trieda sieťovej prevádzky"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Striktná šírka pásma"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Šírka pásma priority"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Šírka pásma skupiny"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Identifikátor skupiny"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Zadajte identifikátor skupiny priorít pre každú používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1699,87 +1749,84 @@ msgstr ""
 "Zadajte povolenú šírku pásma v percentách, ktorú môže využiť každá skupina "
 "priorít. Súčet všetkých skupín musí byť 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "Zadajte percento šírky pásma, ktoré môže využiť každá skupina priorít."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Povoľte alebo zakážte striktnú šírku pásma pre každú používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Zadajte triedu sieťovej prevádzky pre každú používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "Po_užívateľské meno"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Služba"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Z_obraziť heslo"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Heslo"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "Rozhranie _PPP"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Rodičovské rozhranie"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 #, fuzzy
-#| msgid "_Parent interface:"
 msgid "C_laim interface"
 msgstr "_Rodičovské rozhranie:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1787,202 +1834,191 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Krútená dvojlinka (TP)"
 
 # * http://en.wikipedia.org/wiki/Attachment_Unit_Interface
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
 # * http://en.wikipedia.org/wiki/Link_aggregation#Linux_Bonding_Driver_Modes
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
 # * http://en.wikipedia.org/wiki/Media_Independent_Interface
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorovať"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ručné"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Zariadenie"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-#| msgid "C_loned MAC address:"
 msgid "C_loned MAC address"
 msgstr "_Klonovaná MAC adresa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Prebudenie pomocou LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Pre_dvolené"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorovať"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "Vše_smerové vysielanie"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Balík Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "Heslo _pri prebudení pomocou LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Heslo technológie Wake-on-LAN (MAC adresa ethernetu). Heslo je platné iba "
 "pre balíky Magic Packet."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Rýchlosť"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Nie"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Všetci _používatelia sa môžu pripojiť k tejto sieti"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
-#| msgid "Automatically connect to _VPN when using this connection"
 msgid "Automatically connect to _VPN"
 msgstr "Automaticky pripojiť k _VPN keď sa používa toto pripojenie"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-#| msgid "Firewall _zone:"
 msgid "Firewall _zone"
 msgstr "_Zóna Firewall:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-#| msgid "_Teamed connections:"
 msgid "_Metered connection"
 msgstr "_Tímové pripojenia:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1990,20 +2026,19 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
-#| msgid "Ig_nore automatically obtained routes"
 msgid "Connect _automatically with priority"
 msgstr "Ig_norovať automaticky získané smerovania"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 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.h:109
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -2012,7 +2047,7 @@ msgstr ""
 "Adresy IP identifikujú váš počítač v sieti. Kliknite na tlačidlo „Pridať“ na "
 "pridanie statickej adresy IP."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 #, fuzzy
 msgid ""
 "The IP address identify your computer on the network and determines the "
@@ -2024,126 +2059,125 @@ msgstr ""
 "iným počítačom. Kliknite na tlačidlo „Pridať“ na pridanie adresy IP. Ak nie "
 "je poskytnutá žiadna adresa, použije sa jedna z rozsahu 10.42.x.x."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Dodatočné statické adresy"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresy"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adresa (voliteľné)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Pripojené"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "Režim _prenosu"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Názov zariadenia"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Nadradené zariadenie"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Režim"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Miestna adresa IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Vzdialená adresa IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Vstupný kľúč"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Výstupný kľúč"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatické s ručným nastavením DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Lokálne pre linku"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Zdieľané pre iné počítače"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Metóda"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -2154,8 +2188,8 @@ msgstr ""
 "vášho počítača. Ak si želáte použiť identifikátor klienta DHCP, zadajte ho "
 "tu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2163,25 +2197,23 @@ msgstr ""
 "Domény používané pri dekódovaní názvov počítačov. Na oddelenie viacerých "
 "domén použite čiarky."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "Identifikátor klienta D_HCP"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "Domény _hľadania"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "Servery _DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2189,7 +2221,7 @@ msgstr ""
 "Adresy IP doménových menných serverov používaných na dekódovanie názvov "
 "počítačov. Na oddelenie viacerých doménových menných serverov použite čiarky."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Na dokončenie tohto pripojenia je vyžadované adresovanie IPv_4"
 
@@ -2198,7 +2230,7 @@ msgstr "Na dokončenie tohto pripojenia je vyžadované adresovanie IPv_4"
 # MČ: možno som niečo zle pochopil, ale doplnil by som minimálne časticu „Aj“ na začiatok vety. Formuloval by som to takto nejako: „Aj pri zlyhávaní nastavení IPv4, sa pri pripájaní k IPv6 sieťam použijú nastavenia IPv6.“
 # PK: tu ide o to, ze proste zaskrtnes vyzadovanie IPv4, ak to nefacha, tak sa pouzije IPv6
 # tooltip
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2206,35 +2238,35 @@ msgstr ""
 "Pri zlyhavaní nastavení IPv4 pri pripájaní k IPv6 sieťam sa použijú "
 "nastavenia IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Smerovania…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Povolené (uprednostniť verejnú adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Povolené (uprednostniť dočasnú adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 #, fuzzy
 msgid "Stable privacy"
 msgstr "Povoliť"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2245,23 +2277,22 @@ msgstr ""
 "čiarky. Lokálne adresy pre linku budú automaticky pôsobiť pre pripájané "
 "rozhranie."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 #, fuzzy
-#| msgid "IPv6 _privacy extensions:"
 msgid "IPv6 _privacy extensions"
 msgstr "Rozšírenia _súkromia IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Na dokončenie tohto pripojenia je vyžadované adresovanie IPv_6"
 
 # MČ: Tu by som formuláciu, následne prispôsobil tej čo bude použitá vyššie.
 # tooltip
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2269,309 +2300,308 @@ msgstr ""
 "Pri zlyhavaní nastavení IPv6 pri pripájaní k IPv4 sieťam sa použijú "
 "nastavenia IPv4."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 #, fuzzy
-#| msgid "Metric"
 msgid "Strict"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Kľúče"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parametre"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Overenie bezpečnosti"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "Port SCI"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Základné"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Čí_slo"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "Identifikátor si_ete"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Zmeniť…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Povoliť _roaming ak je domáca sieť nedostupná"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:427
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Z_obraziť heslá"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Overenie totožnosti"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Povolené metódy"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfigurovať _metódy…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Kompresia"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Po_užiť šifrovanie pre Point-to-Point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Vyža_dovať 128-bitové šifrovanie"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Použiť _stavové MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Povoliť kompresiu dát _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Povoliť kompresiu dát _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Použiť kompresiu _hlavičky TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Posielať pakety _echo cez PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Žiadne"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Iba pre prehliadač"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Použite túto konfiguráciu sprostredkovateľa proxy iba pre klientov alebo "
 "schémy prehliadačov."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "URL PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "Skript PAC"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL odkiaľ sa má získať skript PAC."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Im_portovať tímovú konfiguráciu zo súboru…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Metóda"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Rozšírené…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Stav portu ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Rozšírené tímové voľby"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "ID _fronty"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "Identifikátor fronty, ku ktorej má byť tento port zmapovaný."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Voľby spúšťača aktívnej zálohy"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "Priorita _portu"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Priorita portu. Vyššie číslo znamená vyššiu prioritu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "_Lepkavý port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Voľby spúšťača LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "Priorita portu _LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "_Kľúč portu LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
@@ -2579,61 +2609,61 @@ msgstr ""
 "Priorita portu zodpovedajúca štandardu LACP. Nižšie číslo znamená vyššiu "
 "prioritu."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 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:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "S_ledovač linky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Oneskorenie _pripojenia"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Oneskorenie _odpojenia"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "_Interval odosielania"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Oneskorenie _pred prvým odoslaním"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Maximum zmeškaných odpovedí"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Zdrojový hostiteľ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "_Cieľový hostiteľ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2641,209 +2671,208 @@ msgstr ""
 "Maximálny počet zmeškaných odpovedí. Ak sa prekročí tento počet, linka je "
 "ohlásená ako odpojená."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignorovať neplatné pakety z _aktívnych portov"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 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:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignorovať neplatné pakety z _neaktívnych portov"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "Odo_slať na neaktívne porty"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Interval medzi odosielaním požiadaviek."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Oneskorenie medzi inicializáciou sledovania linky a prvým odoslaním "
 "požiadavky."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Sledovač linky, ktorý sa má použiť."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Sledovač linky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Im_portovať tímovú konfiguráciu zo súboru…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Upraviť konfiguráciu _JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Najvyššia priorita"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Najvyššia priorita (stabilné)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Šírka pásma"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Najväčší počet portov"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Priorita portu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Z tímového zariadenia"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Z aktívneho portu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Z aktívneho do tímového zariadenia"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "_Tímové pripojenia"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Vyváženie záťaže"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "Adresa IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Akýkoľvek protokol L3"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Akýkoľvek protokol L4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "Počet oznámení účas_tníkom"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "Interval oznáme_ní účastníkom"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Hardvérová adresa"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2851,257 +2880,252 @@ msgstr ""
 "Požadovaná hardvérová adresa nového tímového zariadenia. Obvyklý formát "
 "adresy MAC je prijateľný."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "_Spúšťač"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "Politika _hardvérovej adresy"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Názov spúšťača, ktorý sa má použiť."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Odosielať rámce LACPDU _pravidelne"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Odoslať rámec LACPDU _každú sekundu"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "Priorita _systému"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "_Minimum portov"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Politika výberu _agregátora"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Priorita systému. Hodnota môže byť od 0 - 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Týmto sa vyberie politika, podľa ktorej sa budú vyberať agregátory."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "V desatinách sekúnd. Pravidelný interval medzi znovu vyvážením."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Názov aktívneho vyvažovača vysielania. Aktívne vyvažovanie vysielania je "
 "predvolene zakázané."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Interval vyvažov_ania vysielania"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Vyvažovač _vysielania"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Spúšťač"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Rodičovské rozhranie"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "Názov _rozhrania VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Klonovaná MAC _adresa"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "_Identifikátor VLAN"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Značky"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "P_reusporiadať hlavičky"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Stratiť previazanie"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Názov zariadenia + číslo"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + číslo"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Z_abezpečenie"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klient"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Aktívny bod"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Výkon v_ysielania"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Rýchlosť"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "Kaná_l"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Pá_smo"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-#| msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 "Neexistuje overenie totožnosti nástroja polkit na vykonanie tejto činnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Povolené metódy overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Rozšíriteľný protokol overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokol overenia totožnosti heslom"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol vzájomného overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protokol vzájomného overenia totožnosti, od Microsoftu"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Protokol vzájomného overenia totožnosti, od Microsoftu, verzia 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3110,107 +3134,99 @@ msgstr ""
 "totožnosti. Ak pripojenia zlyhávajú, skúste podporu pre niektoré metódy "
 "zakázať."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Previazané"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tím"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Premostené"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP tunel"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
 # PM: Zásuvnému modulu; pripojenie k VPN
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
-#| msgid ""
-#| "The VPN plugin failed to import the VPN connection correctly\n"
-#| "\n"
-#| "Error: no VPN service type."
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "Zásuvnému modulu VPN sa nepodarilo správne importovať pripojenie k VPN\n"
 "\n"
 "Chyba: neuvedený typ služby VPN."
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Výber súboru na import"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardvérové"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuálne"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importovať uloženú konfiguráciu VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3218,85 +3234,83 @@ msgstr ""
 "Dialógové okno úpravy pripojenia sa nepodarilo inicializovať pre neznámu "
 "chybu."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Nepodarilo sa vytvoriť nové pripojenie"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Odstránenie pripojenia zlyhalo"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Naozaj chcete odstrániť pripojenie %s?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Nové pripojenie"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Maska podsiete"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Brána"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Úprava pripojenia %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Úprava nepomenovaného pripojenia"
 
 # GtkLabel label
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Chýba názov pripojenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Inicializácia editora…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Pripojenie sa nedá upraviť"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Neplatné nastavenie %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3304,54 +3318,54 @@ msgstr ""
 "Editor pripojení nemohol nájsť niektoré vyžadované zdroje (súbor .ui nebol "
 "nájdený)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Uložiť"
 
 # tooltip
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Uloží urobené zmeny na tomto pripojení."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Keď chcete uložiť toto pripojenie pre všetkých používateľov tohto počítača, "
 "tak overte totožnosť."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Nepodarilo sa vytvoriť pripojenie"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Nepodarilo sa upraviť pripojenie"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Neznáma chyba pri vytváraní dialógového okna úpravy pripojení."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 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:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Chyba inicializácie editora"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Pridanie spojenia zlyhalo"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
 # gsettings description
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3361,48 +3375,48 @@ msgstr ""
 "certifikačnej autority pri overovaní totožnosti protokolom EAP."
 
 # GtkLabel label
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "_Názov pripojenia"
 
 # GTKButton label
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Exportovať…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nikdy"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "teraz"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3410,7 +3424,7 @@ msgstr[0] "pred %d minútami"
 msgstr[1] "pred %d minútou"
 msgstr[2] "pred %d minútami"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3418,7 +3432,7 @@ msgstr[0] "pred %d hodinami"
 msgstr[1] "pred %d hodinou"
 msgstr[2] "pred %d hodinami"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3426,7 +3440,7 @@ msgstr[0] "pred %d dňami"
 msgstr[1] "pred %d dňom"
 msgstr[2] "pred %d dňami"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3434,7 +3448,7 @@ msgstr[0] "pred %d mesiacmi"
 msgstr[1] "pred %d mesiacom"
 msgstr[2] "pred %d mesiacmi"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3442,171 +3456,170 @@ msgstr[0] "pred %d rokmi"
 msgstr[1] "pred %d rokom"
 msgstr[2] "pred %d rokmi"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Pripojenie sa nedá odstrániť"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 #, fuzzy
-#| msgid "Team connection %d"
 msgid "Select a connection to edit"
 msgstr "Tímové pripojenie č. %d"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 #, fuzzy
-#| msgid "Team connection %d"
 msgid "Select a connection to delete"
 msgstr "Tímové pripojenie č. %d"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Názov"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Naposledy použité"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Upraviť vybrané pripojenie"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Keď chcete upraviť vybrané pripojenie, tak overte svoju totožnosť"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Odstrániť vybrané pripojenie"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Keď chcete odstrániť vybrané pripojenie, tak overte svoju totožnosť"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, fuzzy, c-format
-#| msgid "Unsupported mobile broadband connection type."
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
 msgid "Unrecognized connection type"
 msgstr "Nepodporovaný typ mobilného pripojenia."
 
 # MČ: %s bude nahradené typom pripojenia, aspoň sa mi tak zdá. Asi skôr „pripojenia“, možno aj zmeniť slovosled
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, fuzzy, c-format
-#| msgid "Don’t know how to create “%s” connections"
 msgid "Don’t know how to import “%s” connections"
 msgstr "Program nevie ako vytvoriť pripojenia typu „%s“"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 #, fuzzy
-#| msgid "Error editing connection"
 msgid "Error importing connection"
 msgstr "Chyba pri úprave pripojenia"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Chyba pri vytváraní pripojenia"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 #, fuzzy
-#| msgid "Connection cannot be modified"
 msgid "Connection type not specified."
 msgstr "Pripojenie sa nedá upraviť"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Nie sú nainštalované žiadne zásuvné moduly VPN."
 
 # MČ: %s bude nahradené typom pripojenia, aspoň sa mi tak zdá. Asi skôr „pripojenia“, možno aj zmeniť slovosled
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Program nevie ako vytvoriť pripojenia typu „%s“"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Chyba pri úprave pripojenia"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Nenašlo sa pripojenie s UUID „%s“"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+# desktop entry name
+# GtkDialog title
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Sieťové pripojenia"
+
+#: src/connection-editor/nm-connection-list.ui:86
 #, fuzzy
-#| msgid "_Add a VPN connection…"
 msgid "Add a new connection"
 msgstr "_Pridať pripojenie k VPN…"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Zabezpečenie protokolu 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Nepodarilo sa načítať používateľské rozhranie pre zabezpečenie protokolu "
 "802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Použiť zabezpečenie protokolu 802.1_X pre toto pripojenie"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAC adresa zariadenia Bluetooth. Príklad: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neplatné Bluetooth zariadenie (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Pripojenie k Bluetooth č. %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Typ pripojenia Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Vyberte typ profilu pripojenia Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Voľná sieť - _Personal Area Network"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Vy_táčaná sieť"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 "Nepodarilo sa načítať používateľské rozhranie pre previazané pripojenie."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primárne"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Previazané pripojenie č. %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 "Nepodarilo sa načítať používateľské rozhranie pre premostené pripojenie."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Premostené pripojenie č. %d"
@@ -3614,38 +3627,37 @@ msgstr "Premostené pripojenie č. %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Port premostenia"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre port premostenia."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre DCB."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre DSL."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 #, fuzzy
-#| msgid "_Parent interface:"
 msgid "missing parent interface"
 msgstr "_Rodičovské rozhranie:"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Pripojenie k DSL č. %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3656,42 +3668,41 @@ msgstr ""
 "jeho názvu rozhrania, alebo trvalej MAC adresy, alebo na základe oboch. "
 "Príklady: „em1“, „3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Ignorované"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Zariadenie ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klonovaná MAC adresa"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Heslo technológie Wake-on-LAN"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Pripojenie k ethernetu č. %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3701,11 +3712,11 @@ msgstr ""
 "zóna, ale jej vybratím ju nastavíte vo firewalle. Užitočné len v prípade keď "
 "je firewall aktívny."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Nepodarilo sa načítať všeobecné používateľské rozhranie."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3719,175 +3730,163 @@ msgstr ""
 "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:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "zariadenie infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Pripojenie k InfiniBand č. %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "Pripojenie k IP tunelu č. %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automaticky (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Automaticky (VPN) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automaticky, len adresy"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automaticky (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automaticky (PPPoE) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automaticky (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automaticky (DHCP) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Lokálne pre linku"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-#| msgid "Additional DNS ser_vers:"
 msgid "Additional DNS ser_vers"
 msgstr "Dodatočné servery _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-#| msgid "Additional s_earch domains:"
 msgid "Additional s_earch domains"
 msgstr "Dodatočné domény _hľadania:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Úprava IPv4 smerovania pre %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Nastavenia IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "Neplatná adresa IPv4 „%s“"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "Neplatná maska podsiete adresy IPv4 „%s“"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "Neplatná brána IPv4 „%s“"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "Neplatný server DNS IPv4 „%s“"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automaticky, iba DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Úprava smerovaní IPv6 pre %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Nastavenia IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "Neplatná adresa IPv6 „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "Neplatný prefix IPv6 „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "Neplatná brána IPv6 „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "Neplatný server DNS IPv6 „%s“"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 #, fuzzy
-#| msgid "Could not load WiMAX user interface."
 msgid "Could not load MACsec user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre WiMAX."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, fuzzy, c-format
-#| msgid "WiMAX connection %d"
 msgid "MACSEC connection %d"
 msgstr "Pripojenie k WiMAX č. %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Duplikátne podriadené rozhrania"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 "Obidve podriadené rozhrania „%s“ a „%s“ sú aplikované na zariadení „%s“"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3896,25 +3895,25 @@ msgstr ""
 "Podriadené zariadenia „%s“ a „%s“ sú aplikované na rozdielne virtuálne porty "
 "(„%s“ a „%s“) toho istého fyzického zariadenia."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "Podriadené rozhranie %s č. %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre mobilné pripojenie."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nepodporovaný typ mobilného pripojenia."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Zvoľte si typ mobilného poskytovateľa"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3923,7 +3922,7 @@ msgstr ""
 "Zvoľte si, ktorú technológiu používa váš poskytovateľ mobilného pripojenia. "
 "Ak nie ste si istý, spýtajte sa vášho poskytovateľa."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Môj poskytovateľ používa technológiu založenú na _GSM (napr. GPRS, EDGE, "
@@ -3931,82 +3930,80 @@ msgstr ""
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Môj poskytovateľ používa technológiu založenú na _CDMA (napr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "žiadne"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Úprava metód overenia totožnosti protokolu PPP pre %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Nastavenia PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre PPP."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 "Nepodarilo sa načítať používateľské rozhranie pre sprostredkovateľa proxy."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Chyba: súbor neobsahuje platnú konfiguráciu JSON"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Nepodarilo sa načítať tímové používateľské rozhranie."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Tímové pripojenie č. %d"
@@ -4014,68 +4011,67 @@ msgstr "Tímové pripojenie č. %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Port tímu"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre port tímu."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (cez „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Nové pripojenie…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre vlan."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Pripojenie k VLAN č. %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Nepodarilo sa načítať zásuvný modul editora VPN pre „%s“ (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "neznáme zlyhanie"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre VPN."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Nepodarilo sa nájsť zásuvný modul VPN pre „%s“."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Pripojenie k VPN č. %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Voľba typu pripojenia k VPN"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -4086,7 +4082,7 @@ msgstr ""
 "typ VPN pripojenia v zozname nenachádza, asi nemáte nainštalovaný správny "
 "VPN zásuvný modul."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -4095,7 +4091,7 @@ msgstr ""
 "Táto voľba uzamkne toto pripojenie s prípojným bodom (AP) Wi-Fi zadaným v "
 "poli BSSID. Príklad: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -4106,95 +4102,93 @@ msgstr ""
 "jeho názvu rozhrania, alebo trvalej MAC adresy, alebo na základe oboch. "
 "Príklady: „wlan0“, „3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi zariadenie"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Pripojenie k Wi-Fi č. %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Kľúč pre WEP 40/128-bitový (šestnástkovo alebo ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo pre WEP 128-bitové"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamické WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Osobné WPA a WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podnikové WPA a WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nepodarilo sa načítať používateľské rozhranie pre zabezpečenie Wi-Fi; "
 "nastavenie Wi-Fi chýba."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Zabezpečenie Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre zabezpečenie Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "chýbajúce SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Zabezpečenie nie je kompatibilné s režimom Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Súbor s názvom „%s“ už existuje."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "Nah_radiť"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Chcete nahradiť %s pripojením k VPN, ktoré práve ukladáte?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Nedá sa exportovať pripojenie k VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4205,116 +4199,103 @@ msgstr ""
 "\n"
 "Chyba: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Exportovať pripojenie k VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Odomknúť"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Automaticky odomknúť toto zariadenie"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Informácie o pripojení"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktívne sieťové pripojenia"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Nie je nastavený žiadny certifikát"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Zvoliť certifikát CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "%s súkromný _kľúč"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "Heslo _súkromného kľúča:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Zvoliť certifikát CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "Po_užívateľov certifikát:"
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Moja krajina nie je uvedená"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Neuvedené"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Môj program nie je uvedený…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Poskytovateľ"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Krajina alebo región"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nainštalované zariadenie pre GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nainštalované zariadenie pre CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Akékoľvek zariadenie"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nové mobilné pripojenie"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4322,86 +4303,71 @@ msgstr ""
 "Tento asistent vám pomôže poľahky nastaviť mobilné pripojenie do bunkovej "
 "(3G) siete."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Budete potrebovať nasledovné informácie:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Názov poskytovateľa vášho mobilného pripojenia"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Názov programu fakturácie vášho mobilného pripojenia"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(v niektorých prípadoch) APN (názov prípojného bodu) programu fakturácie "
 "vášho mobilného pripojenia"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Vytvoriť pripojenie pre _toto mobilné zariadenie:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Nastaviť mobilné pripojenie"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Zoznam krajín alebo regiónov:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Krajina alebo región"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Zvoľte si krajinu alebo región vášho poskytovateľa"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Zvoľte si poskytovateľa zo z_oznamu:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
-#| 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 set up the connection _manually:"
 msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Môj poskytovateľ používa technológiu GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Môj poskytovateľ používa technológiu CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Zvoľte si poskytovateľa"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Vyberte _svoj program:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (názov prípojného bodu) zvoleného programu:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4414,40 +4380,34 @@ msgstr ""
 "Ak si nie ste istý vaším programom, zistite si, prosím, APN vášho programu u "
 "vášho poskytovateľa."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Zvoľte si program fakturácie"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Vaše mobilné pripojenie je nakonfigurované pomocou nasledovných nastavení:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Vaše zariadenie:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Váš poskytovateľ:"
 
 # PM: bolo by dobré uviesť čo je to za program
 # PK: tipujem ze to je nieco ako tarif alebo zmluva (orange co ma programy)
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Váš program:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
 #, fuzzy
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
@@ -4462,155 +4422,146 @@ msgstr ""
 "chcete zmeniť nastavenia vášho mobilného pripojenia, tak zvoľte „Sieťové "
 "pripojenia“ z ponuky Systém >> Nastavenia."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrďte nastavenia mobilného pripojenia"
 
 # ssid
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Žiadne)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Certifikát C_A:"
 
 # base connection, device type
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Neznáme)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "Im_portovať tímovú konfiguráciu zo súboru…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Zvoliť certifikát CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
 msgid "%s certificate _password"
 msgstr "Po_užívateľov certifikát:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Chyba počas prihlasovania"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Chyba pri úprave pripojenia"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Odomknúť"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Prihlásiť"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "Za_pamätať PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Uložiť heslo iba pre tohto používateľa"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Uložiť heslo pre všetkých používateľov"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Zakaždým si pýtať toto heslo"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Heslo nie je potrebné"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Z_obraziť heslá"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Treťoradé heslo:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Druhoradé heslo:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Heslo:"
 
 # tooltip
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Kliknutím pripojíte"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Buď chýba heslo, alebo je pripojenie neplatné. V poslednom rade budete "
-"musieť najskôr upraviť pripojenie pomocou editora nm-connection-editor"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Nové…"
 
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamické WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Vy_tvoriť"
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4618,38 +4569,38 @@ msgstr ""
 "Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
 
 # window title
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Žiadosť o overenie totožnosti pre sieť Wi-Fi"
 
 # desc
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Vyžaduje sa overenie totožnosti pre sieť Wi-Fi"
 
 #  window title
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Vytvorenie novej siete Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nová sieť Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Zadajte názov siete Wi-Fi, ktorú chcete vytvoriť."
 
 # dialog title
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Pripojenie k skrytej sieti Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skrytá sieť Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4658,46 +4609,54 @@ msgstr ""
 "chcete pripojiť."
 
 # GtkLabel label
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Zabezpečenie _Wi-Fi"
 
 # GtkLabel label
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "_Pripojenie"
 
 # GtkLabel label
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "_Adaptér Wi-Fi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Poskytovateľ:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Zoznam krajín alebo regiónov:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Krajina alebo región"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Drôtové"
 
 # MČ: asi by som Mesh neprekladal. Podľa tohoto to vyzerá na špecialny typ bezdrôtovej siete: https://wiki.laptop.org/go/Mesh_Network_Details
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4707,37 +4666,45 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Buď chýba heslo, alebo je pripojenie neplatné. V poslednom rade budete "
+"musieť najskôr upraviť pripojenie pomocou editora nm-connection-editor"
+
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Zabezpečenie _Wi-Fi:"
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Názov siete:"
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "_Pripojenie:"
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptér Wi-Fi:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Použitie:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4745,7 +4712,7 @@ msgstr ""
 "Tento program je súčasťou programu Správca siete (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4753,337 +4720,349 @@ msgstr ""
 "Nie je určený na ovládanie pomocou príkazového riadka, ale je spustený v "
 "pracovnom prostredí GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nepovolené"
 
 # pripojenie
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistrované"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Domáca sieť (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Domáca sieť"
 
 # pripojenie
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "vyhľadáva"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrácia odoprená"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roamingová sieť (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Roamingová sieť"
 
 # id karty; id zariadenia
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Kód PIN „%s“ pre kartu SIM v zariadení „%s“"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Je vyžadovaný kód PIN"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Zariadenie mobilného pripojenia vyžaduje kód PIN"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobilné pripojenie „%s“ je aktívne: (%d%%%s%s)"
 
 # je to posledný parameter %s v predch. reťazci, ide o roamingové pripojenie
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "pripojenie k sieti %s"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Certifikáty PEM (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Súkromné kľúče DER, PEM alebo PKCS č. 12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "nedefinovaná chyba v zabezpečení 802.1X (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 #, fuzzy
 msgid "no CA certificate selected"
 msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "chýba súbor PAC protokolu EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Zvoľiť súbor PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Súbory PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Všetky súbory"
 
 # automatic PAC provisioning
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonymné"
 
 # automatic PAC provisioning
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Overená totožnosť"
 
 # automatic PAC provisioning
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Obe"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
-#| msgid "Anony_mous identity:"
 msgid "Anony_mous identity"
 msgstr "Anony_mná identita:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "_Súbor PAC"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "V_nútorné overenie totožnosti"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Umožniť automatické zao_bstarávanie súboru PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "chýba používateľské meno protokolu EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "chýba heslo protokolu EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Verzia 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Verzia 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-#| msgid "PEAP _version:"
 msgid "PEAP _version"
 msgstr "Verzia protokolu _PEAP:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Doména"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "chýba používateľské meno protokolu EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "chýba heslo protokolu EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Heslo pre WEP 128-bitové"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Z_obraziť heslá"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "chýba identita protokolu EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "nie je vybraný žiadny užívateľský certifikát"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "nie je vybraný žiadny kľúč"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-#| msgid "I_dentity:"
 msgid "I_dentity"
 msgstr "I_dentita:"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Neznáma chyba pri overovaní bezpečnosti 802.1X"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
 # protocol
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunelované TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Chránený protokol EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-#| msgid "Au_thentication:"
 msgid "Au_thentication"
 msgstr "_Overenie totožnosti:"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "chýba používateľské meno protokolu leap"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "chýba heslo protokolu leap"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "chýba kľúč zabezpečenia wep"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba "
 "hexadecimálne čísla"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -5091,7 +5070,7 @@ msgstr ""
 "neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba znaky v "
 "kódovaní ascii"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5100,41 +5079,40 @@ msgstr ""
 "neplatný kľúč zabezpečenia wep: nesprávna dĺžka kľúča %zu. Kľúč musí byť o "
 "dĺžke buď 5/13 (ascii) alebo 10/26 (hexadecimálne)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neplatný kľúč zabezpečenia wep: heslo nemôže byť prázdne"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neplatný kľúč zabezpečenia wep: heslo musí byť kratšie ako 64 znakov"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvorený systém"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Zdieľaný kľúč"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Predvolené)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Kľúč"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Zo_braziť kľúč"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
-#| msgid "WEP inde_x:"
 msgid "WEP inde_x"
 msgstr "Inde_x kľúča WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5143,16 +5121,22 @@ msgstr ""
 "neplatné zabezpečenie wpa-psk: neplatná dĺžka kľúča %zu. Musí byť o dĺžke "
 "[8,63] bajtov alebo 64 hexadecimálnych čísel"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neplatné zabezpečenie wpa-psk: nedá sa interpretovať 64 bajtový kľúč ako "
 "hexadecimálny"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Typ"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (predvolené)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorované"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr ""
 #~ "Kvôli neznámej chybe sa nepodarilo aktualizovať utajované údaje "
@@ -5567,12 +5551,6 @@ msgstr "_Typ"
 #~ msgid "%s Network"
 #~ msgstr "Sieť %s"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Sekundárny DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Ternárny DNS:"
-
 # PK: ak ma niekto simku, prosim o otestovanie
 #~ msgid "Any"
 #~ msgstr "Akékoľvek"
diff --git a/po/sl.po b/po/sl.po
index fd13f83d..3e32097e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2015-03-24 19:43+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
@@ -23,46 +24,55 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Upravljanje omrežnih povezav"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Omrežne povezave"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Dejavne omrežne storitve"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Upravljanje in spreminjanje nastavitev omrežne povezave"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Onemogoči obvestila ob vzpostavitvi povezav"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Izbrana možnost onemogoča obvestila ob vzpostavitvi povezave z omrežjem."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Onemogoči obvestila ob prekinitvi povezav"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Izbrana možnost onemogoča obvestila ob prekinitvi omrežne povezave."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Onemogoči obvestila VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -70,55 +80,56 @@ msgstr ""
 "Izbrana možnost onemogoča obvestila ob povezovanju ali prekinjanju omrežne "
 "povezave VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Prepreči obvestila o razpoložljivosti omrežij"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Izbrana možnost onemogoča obvestila o razpoložljivosti brezžičnih Wi-Fi "
 "omrežij."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Žig"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Uporabljeno za določanje ali naj bodo nastavitve preseljene v novo različico."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Onemogoči ustvarjanje Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Izbrana možnost onemogoči ustvarjanje omrežij adhoc med uporabo apleta. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Pokaži aplet v obvestilni vrstici"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "Neizbrana možnost onemogoči prikaz apleta v obvestilni vrstici."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Prezri potrdilo CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "Izbrana možnost onemogoča opozorila o potrdilih CA overitve EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -126,129 +137,142 @@ msgstr ""
 "Izbrana možnost onemogoča opozorila o potrdilih CA na drugem koraku overitve "
 "EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Aplet upravljalnika omrežja"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Nobene omrežne povezave"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Aplet upravljalnika omrežja"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Overitev 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Ime omrežja:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "varna."
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Dodajanje ali odpiranje povezave je spodletelo."
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Povezava je spodletela"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Odklapljanje naprave je spodletelo."
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Napaka odklapljanja"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Omogočanje povezave je spodletelo."
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Tega sporočila ne pokaži več"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -258,7 +282,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je prekinjena zaradi prekinitve omrežne povezave."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi prekinitve omrežne povezave."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "Povezava VPN '%s' je spodletela zaradi nepričakovane zaustavitve storitve "
 "VPN."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -289,7 +313,7 @@ msgstr ""
 "Povezava VPN '%s' je spodletela, ker je storitev VPN vrnila neveljavno "
 "nastavitev. "
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -298,7 +322,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi zakasnitve poskusa povezave. "
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -307,7 +331,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi nepravočasnega zagona storitve VPN."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -316,7 +340,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi spodletelega zagona storitve VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +349,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi neveljavnih varovanih podatkov VPN."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +358,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi neveljavnih varovanih podatkov VPN ."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +367,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -354,19 +378,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Povezava VPN je uspešno vzpostavljena.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Prijavno sporočilo VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Neuspela povezava VPN "
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -379,7 +403,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -392,322 +416,333 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "naprava ni pripravljena (strojna programska oprema manjka)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "naprava ni pripravljena"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "povezava je bila prekinjena"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "naprava ni upravljana"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Ni razpoložljivih omrežnih naprav"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Povezave _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Nastavi VPN ..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Povezave _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Upravljalnik omrežja ni zagnan ..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Omrežje je onemogočeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Omogoči _omrežje"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Omogoči _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Omogoči _mobilno širokopasovno omrežje"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Omogoči _obvestila"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Podrobnosti o povezavi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Urejanje povezav ..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O Programu"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Vzpostavljena je povezava z '%s'."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Povezava je prekinjena"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Omrežna povezava je bila prekinjena."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Pripravljanje omrežne povezave '%s' ..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Poteka zahteva za pridobitev omrežnega naslova za '%s' ..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Omrežna povezava '%s' je dejavna"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Zaganjanje VPN povezave '%s' ..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Za povezavo VPN  '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Poteka zahteva naslova VPN za '%s' ..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Povezava VPN '%s' je dejavna"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nobene omrežne povezave"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Aplet upravljalnika omrežja"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Napačna koda PUK; stopite v stik s svojim ponudnikom."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Napačna koda PIN; stopite v stik s svojim ponudnikom."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Pošiljanje kode za odklepanje ..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilni širokopasovni dostop (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilni širokopasovni dostop"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Na voljo"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Nova mobilna širokopasovna povezava"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Povezava je vzpostavljena"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Povezani ste z mobilnim širokopasovnim omrežjem."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilno širokopasovno omrežje."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Vzpostavljena je povezava v domače omrežje."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Vzpostavljena je povezava v gostujoče omrežje."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Vzpostavljena je povezava z mobilnim širokopasovnim omrežjem."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Pripravljanje mobilne širokopasovne povezave '%s' ..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Nastavljanje mobilne širokopasovne povezave '%s' ..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Za mobilno širokopasovno povezavo '%s' je zahtevana overitev uporabnika ... "
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobilna širokopasovna povezava '%s' je dejavna"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Samodejni eternet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Omrežja eternet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Omrežje eternet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Omrežja eternet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Omrežje eternet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Vzpostavljena je povezava z omrežjem eternet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Pripravljanje žične omrežne povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Prilagajanje nastavitev žične omrežne povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Za žično povezavo '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Poteka pridobivanje omrežnega naslova povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Žična omrežna povezava '%s' je dejavna"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL overitev"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Poveži se s skritim omrežjem Wi-Fi"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Ustvari novo brezžično omrežje"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Dodajanje nove povezave je spodletelo."
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Omrežja Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Omrežje Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Omrežja Wi-Fi"
@@ -715,240 +750,255 @@ msgstr[1] "Omrežje Wi-Fi"
 msgstr[2] "Omrežji Wi-Fi"
 msgstr[3] "Omrežja Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Brezžično omrežje Wi-Fi je onemogočeno"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Vmesnik WiMAX je onemogočen s stikalom strojne opreme"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Več omrežij"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Razpoložljiva omrežija Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Uporabite meni omrežja za povezavo z brezžičnim Wi-Fi omrežjem"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Vzpostavljena je povezava z brezžičnim omrežjem eternet Wi-Fi '%s'."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Pripravljanje omrežne povezave Wi-Fi '%s' ..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Prilagajanje nastavitev omrežne povezave Wi-Fi '%s' ..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Za brezžično povezavo Wi-Fi '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Poteka pridobivanje omrežnega naslova Wi-Fi za '%s' ..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Dejavna brezžična omrežna povezava '%s': %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Brezžična omrežna povezava '%s' je dejavna"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Omogočanje povezave je spodletelo."
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Napaka pri prikazovanju podrobnosti o povezavi:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamični WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Naslovi"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Brez"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (privzeto)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Naslov za razpršeno oddajanje"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Maska podomrežja"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Glavni DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Drugi DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Tretji DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Splošno"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Naslov strojne opreme"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Gonilnik"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Varnost:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Privzeta smer"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Prezrto"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Geslo:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Vrsta VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Prehod VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Uporabniško ime VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Pasica VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Osnovna povezava"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Ni mogoče najti veljavnih dejavnih povezav!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
+#, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -956,17 +1006,21 @@ msgstr ""
 "Avtorske pravice © 2005-2008 Novell, Inc.\n"
 "in veliko drugih posameznikov, ki so prispevali skupnosti."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet področja obvestil za upravljanje vaših omrežnih naprav in povezav."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Spletišče upravljalnika omrežja"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -974,33 +1028,33 @@ msgstr ""
 "Aplet upravljalnika omrežja ne najde nekaterih zahtevanih sredstev "
 "(datoteke .ui ni mogoče najti)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Manjkajoča sredstva"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Geslo mobilnega širokopasovnega dostopa"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Za povezavo z '%s' je zahtevano geslo."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Zahtevan je odklep PIN SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Zahtevan je odklep PIN SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1010,25 +1064,25 @@ msgstr ""
 "PIN."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Koda PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Pokaži kodo kodo PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Zahtevan je odklep PUK SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Zahtevan je odklep PUK SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1038,35 +1092,42 @@ msgstr ""
 "PUK."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Koda PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Nova koda PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Znova vnesite novo kodo PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Pokaži kode 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Podatki o povezavi"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Ustvarjanje povezave DUN je spodletelo: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1075,41 +1136,41 @@ msgstr ""
 "Naslovi IP določajo istovetnost računalnika na omrežju. Naslov IP je mogoče "
 "dodati s klikom na gumb \"Dodaj\"."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Izbriši"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Prezri samodejno pridobljene smeri"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Uporabi _povezavo le za sredstva na lastnem omrežju"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1117,16 +1178,16 @@ msgstr ""
 "Izbrana možnost določa, da izbrana povezava nikoli ne bo uporabljena kot "
 "privzeta omrežna povezava."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Ustvari ..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Izbor vrste povezave"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1138,85 +1199,100 @@ msgstr ""
 "V primeru, da vrste povezave VPN, ki jo želite ustvariti, ni na seznamu, "
 "morda ni nameščenega ustreznega vstavka VPN."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Storitev:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Krožno dodeljevanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Dejavna varnostna kopija"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Razpršeno oddajanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Prilagodljivo ravnoteženje bremena oddajanja"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Prilagodljivo ravnoteženje obremenitev"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (priporočeno)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Zvezane pove_zave:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Način:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Pogostost nadzora:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Ime vmesnika:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Nadzo_rovanje povezav:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Cilji ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1224,19 +1300,22 @@ msgstr ""
 "Naslov IP ali z vejicami ločen seznam naslovov IP, ki ga je trebA pogledati "
 "ob preverjanju stanja povezave."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Zamik povezave navz_gor:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Zamik povezave navz_dol:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Osnovno:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1244,104 +1323,162 @@ msgstr ""
 "Ime vmesnika osnovne naprave. Nastavitev določa, da bo ta naprava vedno "
 "dejavna podrejena povezava, ko bo na voljo."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajti"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Strošek poti:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Prednost:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Način _lasnice:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Premoščene pove_zave:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Zamik prepo_šiljanja:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Pozdravni čas:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Omogoči poizvedovanje I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Omogoči _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Najv. starost:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Čas _staranja:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "samodejno"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "privzeto"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Omogoči"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1352,196 +1489,236 @@ msgstr ""
 "kateri je ta povezava omogočena. Ta zmožnost je poznana kot kloniranje MAC "
 "ali lažno predstavljanje: primer: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Naslov"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Naslov"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Ime vmesnika VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Naslov strojne opreme:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Katerakoli naprava"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Zaradi neznane napake ni mogoče posodobiti varovanih podatkov povezave."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Za to povezavo uporabi protokol DCB"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Nadzor toka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Zmožnost"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Omogoči"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Oglaševanje"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Willing"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prednost"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Možnosti ..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prednostne skupine"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Tkanina"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Nadzor prednostnega pretoka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Omogoči oziroma onemogoči prednostni premor prenosa za vsako nastavitev "
 "prednostno skupino."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Prednost:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Vrsta prometa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Omejena pasovna širina:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Prednostna pasovna širina:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Pasovna širina skupine:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ID skupine:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Vpišite ID prednostne skupine za vsako skupino uporabnikov."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1549,244 +1726,306 @@ msgstr ""
 "Vpis dovoljenega odstotka povezave za vsako prednostno skupino. Vsota vseh "
 "skupin mora biti 100 %."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "Vpis odstotka za prednostno skupino pri uporabi povezave."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Omogoči oziroma onemogoči omejitev pasovne širine za vsako prednostno "
 "skupino."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Vpišite razred prometa za vsako uporabniško skupino."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Uporabniško ime:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Storitev:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Pokaži _geslo"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Geslo:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Vmesnik"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Nadrejeni vmesnik:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Nadrejeni vmesnik:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Vmesnik enote pripenjanja (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Od nosilca neodvisen vmesnik (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ročno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Vrata:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Storitev:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Kloniran naslov MAC:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Geslo osebnega ključa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Privzeto"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Prezri"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Razpršeno oddajanje"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Geslo osebnega ključa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Hitrost:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Polno d_vostransko"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Ob uporabi te povezave se samodejno poveži v _VPN"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Brez"
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "V to omrežje se lahko povežejo vsi _uporabniki"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "V to omrežje se poveži _samodejno, če je na voljo"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Ob uporabi te povezave se samodejno poveži v _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Podrobnosti o povezavi"
+msgid "Firewall _zone"
+msgstr "_Območje požarnega zidu:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Povezave _skupine:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Prezri samodejno pridobljene smeri"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Območje požarnega zidu:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1795,7 +2034,7 @@ msgstr ""
 "Naslovi IP določajo istovetnost računalnika na omrežju. Naslov IP je mogoče "
 "dodati s klikom na gumb \"Dodaj\"."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1803,128 +2042,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Samodejno, le naslovi"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Naslovi"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Način _prenosa:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Način _prenosa:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Ime naprave + številka"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Eternet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Način:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Samodejno z ročnimi nastavitvami DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Poveži-krajevno"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Souporaba z ostalimi računalniki"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Način:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1935,8 +2178,8 @@ msgstr ""
 "računalnika po meri. V primeru, da želite uporabiti določilnik odjemalca "
 "DHCP, ga vnesite tu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1944,25 +2187,26 @@ msgstr ""
 "Domene uporabljene za razreševanje imen gostiteljev. Za ločevanje več domen "
 "uporabite vejice."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID odjemalca D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Preišči _domene:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_Strežniki DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1970,11 +2214,11 @@ msgstr ""
 "Naslovi IP imenskih strežnikov domen, ki so uporabljeni za razreševanje imen "
 "gostiteljev. Za ločevanje več imenskih strežnikov domen uporabite vejice. "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Zahtevaj naslavljanje IPv_4 za dokončanje te povezave"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1982,25 +2226,35 @@ msgstr ""
 "Pri povezovanju z IPv6 zmožnimi omrežji omogoča dokončanje povezave, če "
 "nastavitev IPv4 spodleti in je nastavitev IPv6 uspešna."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Smeri ..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Onemogočeno"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Omogočeno (prednostni javni naslov)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Omogočeno (prednostni začasni naslov)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Omogoči"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2010,15 +2264,20 @@ msgstr ""
 "gostiteljev. Za ločevanje več imenskih strežnikov domen uporabite vejice. "
 "Krajevno povezani naslovi bodo avtomatično dodani v vmesnik povezav."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Razširitve _zasebnosti IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Zahtevaj naslavljanje IPv_6 za dokončanje te povezave"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2026,756 +2285,862 @@ msgstr ""
 "Pri povezovanju na omrežja s podporo IPv4 povezava omogoča dokončanje "
 "povezave, če nastavitev IPv6 spodleti in je nastavitev IPv4 uspešna. "
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Merilo"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Osnovno"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Številka:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_IPK:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ID omr_ežja:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Spremeni ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Omogoči _prehajanje, če domače omrežje ni na voljo"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Pokaži _gesla"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Overitev"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Dovoljeni načini:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Nastavi _načine ..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Stiskanje"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Uporabi šifriranje od _točke-do-točke (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Zahtevaj 128-bitno šifriranje"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Uporabi _nepovratni MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Dovoli stiskanje podatkov _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Dovoli stiskanje podatkov _deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Uporabi stiskanje _glave TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Echo"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Pošlji pakete PPP _echo"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Način:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "_Uvozi nastavitve skupine iz datoteke ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Način:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Omrežja eternet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Prednost:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Prednost:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Prednost:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Osebni _ključ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Zamik povezave navz_gor:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Zamik povezave navz_dol:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Nadrejeni vmesnik:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Cilji ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Cilji ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "_Uvozi nastavitve skupine iz datoteke ..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Nastavitev _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Pasovna širina skupine:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Prednost"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Eternet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Povezave _skupine:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eternet"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Naslov strojne opreme:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Naslov strojne opreme:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Prednost:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Prenosna _moč:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Prenosna _moč:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Nadrejeni vmesnik:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Ime vmesnika VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Kloniran naslov MAC:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_ID VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Ime naprave + številka"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + številka"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Varnost:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Prenosna _moč:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Hitrost:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "Pa_s:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Dovoljeni načini overitve"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Razširljivi overitveni protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokol overitve gesla"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol Challenge za overitev izmenjave signalov"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protokol Microsoft Challenge za overitev izmenjave signalov"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Protokol Microsoft Challenge za overitev izmenjave signalov različica 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2785,190 +3150,185 @@ msgstr ""
 "primeru, da povezave spodletijo, poskusite onemogoči podporo za nekatere "
 "načine."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Vez"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Skupina"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Premosti"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Vstavek VPN ni uspel pravilno uvoziti povezave VPN\n"
-"\n"
-"Napaka: vrsta storitve VPN ni navedena."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Povezave VPN ni mogoče uvoziti "
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Datoteke '%s' ni mogoče prebrati ali pa ne vsebuje prepoznanih podatkov o "
-"povezavi VPN\n"
+"Vstavek VPN ni uspel pravilno uvoziti povezave VPN\n"
 "\n"
-"Napaka:%s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Neznana napaka"
+"Napaka: vrsta storitve VPN ni navedena."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Izbor datoteke za uvoz"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Strojna oprema"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Navidezno"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Uvozi shranjene nastavitve VPN ..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Pogovornega okna urejevalnika povezav ni mogoče začeti zaradi neznane napake."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Ni mogoče ustvariti nove povezave"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Izbris povezave ni uspel"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ali ste prepričani, da želite izbrisati povezavo %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Povezave _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Naslov"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Omrežna maska"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Prehod"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Merilo"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Predpona"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Urejanje %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Urejanje neimenovane povezave"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Ime povezave:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Napaka med začenjanjem urejevalnika"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Dodajanje povezave ni uspelo"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2976,101 +3336,99 @@ msgstr ""
 "Urejevalnik povezav ni našel zahtevanih sredstev (datoteke .ui ni mogoče "
 "najti)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Shrani vse spremembe narejene na tej povezavi."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Overi za shranitev te povezave za vse uporabnike tega računalnika."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Povezave ni mogoče ustvariti"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ni mogoče urediti povezave"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Neznana napaka med ustvarjanjem pogovornega okna urejevalnika povezav."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Napaka med začenjanjem urejevalnika"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Dodajanje povezave ni uspelo"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "Izbrana možnost onemogoča opozorila o potrdilih CA overitve EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Ime povezave:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Izvozi ..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nikoli"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "zdaj"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3079,7 +3437,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3088,7 +3446,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3097,7 +3455,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3106,7 +3464,7 @@ msgstr[1] "Pred %d mesecem"
 msgstr[2] "Pred %d mesecema"
 msgstr[3] "Pred %d meseci"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3115,122 +3473,167 @@ msgstr[1] "Pred %d letom"
 msgstr[2] "Pred %d letoma"
 msgstr[3] "Pred %d leti"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Dodajanje povezave ni uspelo"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Povezava skupine %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Povezava skupine %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Nazadnje uporabljeno"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Uredi izbrano povezavo"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Overi za urejanje izbrane povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Izbriši izbrano povezavo"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Overi za izbris izbrane povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Nepodprta vrsta mobilnih širokopasovnih povezav."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ni jasno, kako ustvariti '%s' povezav"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Napaka med urejanjem povezave"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Napaka med ustvarjanjem povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Dodajanje povezave ni uspelo"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Vstavki VPN niso nameščeni."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ni jasno, kako ustvariti '%s' povezav"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Napaka med urejanjem povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Ni mogoče najti povezave z UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Omrežne povezave"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Povezave _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Varnost 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Uporabniškega vmesnika za 802.1X ni mogoče naložiti."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Za to povezavo uporabi varnostni protokol 802.1X"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Ni mogoče naložiti uporabniškega vmesnika za Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Povezava vezi %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Omrežje eternet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Omrežja Wi-Fi"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Uporabniškega vmesnika nastavitev vezi ni mogoče naložiti."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Osnovno:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Povezava vezi %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Uporabniškega vmesnika premoščanja ni mogoče naložiti."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Premosti povezavo %d"
@@ -3238,32 +3641,37 @@ msgstr "Premosti povezavo %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Vrata premostitve"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Uporabniškega vmesnika za premoščanje ni mogoče naložiti."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Uporabniškega vmesnika DCB ni mogoče naložiti."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Uporabniškega vmesnika DSL ni mogoče naložiti."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Nadrejeni vmesnik:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Povezava DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3273,44 +3681,43 @@ msgstr ""
 "Ta možnost zaklene to povezavo na omrežno napravo navedeno s svojim trajnim "
 "naslovom MAC, vnesenim tukaj. Primer: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Prezrto"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Uporabniškega vmesnika za eternet ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Eternet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Kloniran naslov MAC:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Povezava eternet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3320,11 +3727,11 @@ msgstr ""
 "njegovim izborom uporabite privzeto območje, nastavljeno s požarnim zidom. "
 "Uporabno le, če je aktvirian firewalld."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Splošnega uporabniškega vmesnika ni mogoče naložiti."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3335,158 +3742,162 @@ msgstr ""
 "Ta možnost zaklene to povezavo na omrežno napravo navedeno s svojim trajnim "
 "naslovom MAC, vnesenim tukaj. Primer: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Uporabniškega vmesnika InfiniBand ni mogoče naložiti."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Povezava InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Uporabniškega vmesnika IPv4 ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Povezava eternet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Samodejno (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Le samodejni (VON) naslovi"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Samodejno, le naslovi"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Samodejno (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Le samodejni (PPPoE) naslovi"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Samodejno (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Le samodejni (DHCP) naslovi"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Poveži le krajevno"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Dodatni strežniki _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dodatne i_skalne domene:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Urejanje smeri IPv4 za %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Nastavitve IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Uporabniškega vmesnika IPv4 ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Samodejno, le DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Urejanje smeri IPv6 za %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Nastavitve IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Uporabniškega vmesnika IPv6 ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Uporabniškega vmesnika WiMAX ni mogoče naložiti."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Povezava WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Podvojene podrejene vezi"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Podrejeni '%s' in '%s' sta povezani z napravo '%s'"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3495,26 +3906,26 @@ msgstr ""
 "Podrejeni skupini '%s' in '%s' se navezujejo na različna navidezna vrata "
 "('%s' in '%s') na isti fizični napravi."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podrejen %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Uporabniškega vmesnika mobilnih širokopasovnih povezav ni mogoče naložiti."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nepodprta vrsta mobilnih širokopasovnih povezav."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izbor vrste ponudnika mobilnih širokopasovnih povezav"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3523,7 +3934,7 @@ msgstr ""
 "Izberite tehnologijo svojega ponudnika mobilnih širokopasovnih povezav. Če "
 "niste prepričani, vprašajte ponudnika."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Moj ponudnik uporablja na _GSM osnovano tehnologijo (npr. GPRS, EDGE, UMTS, "
@@ -3531,85 +3942,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Moj ponudnik uporablja na _CDMA osnovano tehnologijo (npr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "brez"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Urejanje načinov overitve PPP za %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Nastavitve PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Uporabniškega vmesnika PPP ni mogoče naložiti."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Uporabniškega vmesnika nastavitev vezi ni mogoče naložiti."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Napaka: datoteka ne vsebuje veljavnih JSON nastavitev"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Uporabniškega vmesnika skupine ni mogoče naložiti."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Povezava skupine %d"
@@ -3617,69 +4024,69 @@ msgstr "Povezava skupine %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Vrata skupine"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Uporabniškega vmesnika vrat skupine ni mogoče naložiti."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (preko \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Nobene omrežne povezave"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Uporabniškega vmesnika VLAN ni mogoče naložiti."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Povezava VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Ni mogoče naložiti uporabniškega vmesnika VPN"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Vstavka storitve VPN za '%s' ni mogoče najti."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Vstavka storitve VPN za '%s' ni mogoče najti."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Povezava je spodletela"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Ni mogoče naložiti uporabniškega vmesnika VPN"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Vstavka storitve VPN za '%s' ni mogoče najti."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Povezava VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Izberite vrsto povezave VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3690,7 +4097,7 @@ msgstr ""
 "vrste povezave VPN, ki jo želite ustvariti, ni na seznamu, morda ni "
 "nameščenega ustreznega vstavka VPN."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3699,7 +4106,7 @@ msgstr ""
 "Ta možnost zaklene to povezavo na brezžično priklopno točko Wi-Fi navedeno z "
 "določilom BSSID. Primer: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3709,98 +4116,96 @@ msgstr ""
 "Ta možnost zaklene to povezavo na omrežno napravo navedeno s svojim trajnim "
 "naslovom MAC, vnesenim tukaj. Primer: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Uporabniškega vmesnika Wi-Fi ni mogoče naložiti."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Katerakoli naprava"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Povezava Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Ključ WEP 40/128-bit (Šestnajstiški ali ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bit šifrirno geslo WEP"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamični WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Osebni WPA in WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podjetniški WPA in WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Uporabniškega vmesnika varnosti Wi-Fi ni mogoče naložiti; manjka nastavitev "
 "Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Varnost Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Uporabniškega vmesnika varnosti Wi-Fi ni mogoče naložiti."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Datoteka z imenom \"%s\" že obstaja."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Ali želite zamenjati povezavo %s z nastavitvami povezave VPN, ki jih "
 "shranjujete?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Ni mogoče izvoziti povezave VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3811,224 +4216,106 @@ msgstr ""
 "\n"
 "Napaka: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Izvoz povezave VPN ..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Odkleni"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Samodejno odkleni napravo"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Podatki o povezavi"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Dejavne omrežne storitve"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izbor potrdila CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Osebni _ključ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Geslo osebnega ključa:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Izbor potrdila CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Uporabniško potrdilo:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Vaša mobilna širokopasovna povezava ima naslednje nastavitve:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Vaša naprava:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Vaš ponudnik:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Vaš naročniški paket:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"S ponudnikom mobilnega širokopasovnega omrežja bo vzpostavljena povezava z "
-"izbranimi nastavitvami. V primeru, da povezava spodleti ali pa omrežnih "
-"sredstev ni mogoče uporabljati, preverite svoje nastavitve. Za spremembo "
-"nastavitev mobilne širokopasovne povezave izberite \"Omrežne povezave\" v "
-"meniju Sistem >> Možnosti. "
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Potrdite nastavitve mobilnega širokopasovnega omrežja"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Moje države ni na seznamu"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nenavedeno"
 
-# tukaj govorimo o načinu preklopa
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Izberite svoj naročniški paket:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Izbor _IPK (Imena PriKlopne točke) paketa:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Opozorilo: izbira napačne priklopne točke lahko neugodno vpliva na znesek "
-"računa vašega širokopasovnega dostopa ali prepreči povezovanje.\n"
-"\n"
-"Če ne veste, kaj izbrati, vprašajte svojega ponudnika za priklopno točko za "
-"vaš naročniški paket."
-
-# način je bolj smiselno kot načrt ..
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Izbor naročniškega paketa"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Moj načrt ni na seznamu ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "S _seznama izberite svojega ponudnika:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Ponudnik"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Ponudnik:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Ponudnik uporablja tehnologijo GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Ponudnik uporablja tehnologijo CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Izbor ponudnika"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Seznama držav ali regij:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Država ali regija"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Moje države ni na seznamu"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Izberite državo ali področje svojega ponudnika"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nameščena naprava GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nameščena naprava CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Katerakoli naprava"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna širokopasovna povezava"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4036,191 +4323,272 @@ msgstr ""
 "Pomočnik pomaga pri hitrem nastavljanju mobilne širokopasovne povezavo v "
 "mobilno 3G omrežje."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Navesti je treba naslednje podatke:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Ime ponudnika širokopasovnih storitev"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Ime naročniškega paketa širokopasovnega dostopa"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(v nekaterih primerih) IPK (Ime PriKlopne točke) vašega širokopasovnega "
 "naročniškega paketa"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Ustvari povezavo za _to širokopasovno mobilno napravo:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Katerakoli naprava"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Nastavite mobilno širokopasovno povezavo"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova mobilna širokopasovna povezava"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Država ali regija"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izberite državo ali področje svojega ponudnika"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "S _seznama izberite svojega ponudnika:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Ponudnik uporablja tehnologijo GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Ponudnik uporablja tehnologijo CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Izbor ponudnika"
+
+# tukaj govorimo o načinu preklopa
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Izberite svoj naročniški paket:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izbor _IPK (Imena PriKlopne točke) paketa:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Opozorilo: izbira napačne priklopne točke lahko neugodno vpliva na znesek "
+"računa vašega širokopasovnega dostopa ali prepreči povezovanje.\n"
+"\n"
+"Če ne veste, kaj izbrati, vprašajte svojega ponudnika za priklopno točko za "
+"vaš naročniški paket."
+
+# način je bolj smiselno kot načrt ..
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Izbor naročniškega paketa"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopasovna povezava ima naslednje nastavitve:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Vaša naprava:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Vaš ponudnik:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Vaš naročniški paket:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"S ponudnikom mobilnega širokopasovnega omrežja bo vzpostavljena povezava z "
+"izbranimi nastavitvami. V primeru, da povezava spodleti ali pa omrežnih "
+"sredstev ni mogoče uporabljati, preverite svoje nastavitve. Za spremembo "
+"nastavitev mobilne širokopasovne povezave izberite \"Omrežne povezave\" v "
+"meniju Sistem >> Možnosti. "
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potrdite nastavitve mobilnega širokopasovnega omrežja"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(brez)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Potrdilo _CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Neznano"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Izbor potrdila CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Uporabniško potrdilo:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Napaka med urejanjem povezave"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Odkleni"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Shrani gesla le za tega _uporabnika"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Shrani gesla za _vse uporabnike"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Vsakokrat _vprašaj za to geslo"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Za povezavo z '%s' je zahtevano geslo."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Drugotno geslo:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "_Pokaži gesla"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Drugotno geslo:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "_Pokaži gesla"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Drugotno geslo:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Prekini povezavo"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Brez"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamični WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4228,35 +4596,35 @@ msgstr ""
 "Za povezavo v brezžično omrežje '%s' je zahtevana overitev ali nastavitev "
 "šifrirnega ključa."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Zahtevana je overitev za brezžično omrežje"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Brezžično omrežje zahteva overitev"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Ustvari novo brezžično omrežje"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Novo omrežje Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Vnesite ime brezžičnega omrežja, ki ga želite ustvariti."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se s skritim omrežjem Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skrito omrežje Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4264,35 +4632,55 @@ msgstr ""
 "Vnesite ime in varnostne podrobnosti skritega omrežja Wi-Fi, s katerim se "
 "želite povezati."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Varnost Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "P_ovezava:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Vmeskin Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Ponudnik:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Seznama držav ali regij:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Država ali regija"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Žično"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Mreža OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4302,17 +4690,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Varnost Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime omrežja:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "P_ovezava:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Vmeskin Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4320,418 +4730,486 @@ msgstr ""
 "Ta program je sestavni del programa NetworkManager (http://projects.gnome."
 "org/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "Ni namenjen ukazni vrstici, saj teče v namiznem okolju GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ni omogočeno"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ni vpisano"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Domače omrežje (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Domače omrežje"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "iskanje"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "vpis je zavrnjen"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s prehajajoče)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (prehajajoče)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Prehajajoče omrežje (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Prehajajoče omrežje"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Koda PIN za kartico SIM '%s' na '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Zahtevana koda PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Za napravo mobilnega širokopasovnega dostopa je zahtevana koda PIN."
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobilna širokopasovna povezava '%s' je dejavna: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "prehajajoči način"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Povezava %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER ali PEM potrdila (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ali PKCS#12 zasebni ključi (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Izbor datoteke PAC ..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Datoteke PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Brezimno"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Overjeno"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Brezimna istovetnost:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Datoteka _PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Notranja overitev:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Dovoli samodejno odbiro PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Izbor pooblastitelja potrdila ..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Različica 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Različica 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Potrdilo _CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Različica PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "128-bit šifrirno geslo WEP"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Pokaži gesla"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ni _zahtevano nobeno potrdilo"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ni _zahtevano nobeno potrdilo"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Istovetnost:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "ges"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "Hitro"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tuneliran TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Varovani EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Overitev:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (privzeto)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Odpri sistem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Souporabljen ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (privzeto)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ključ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Pokaži ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_Določilo WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "Vrs_ta:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (privzeto)"
+
+#~ msgid "Ignored"
+#~ msgstr "Prezrto"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "Zaradi neznane napake ni mogoče posodobiti varovanih podatkov povezave."
+
+#~ msgid "Priority:"
+#~ msgstr "Prednost:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "V to omrežje se poveži _samodejno, če je na voljo"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Podrobnosti o povezavi"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Povezave VPN ni mogoče uvoziti "
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Datoteke '%s' ni mogoče prebrati ali pa ne vsebuje prepoznanih podatkov o "
+#~ "povezavi VPN\n"
+#~ "\n"
+#~ "Napaka:%s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Neznana napaka"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Izbor pooblastitelja potrdila ..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Potrdilo _CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Aplet upravljalnika omrežja"
@@ -4765,30 +5243,6 @@ msgstr "Vrs_ta:"
 #~ 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"
 
@@ -4973,12 +5427,6 @@ msgstr "Vrs_ta:"
 #~ msgid "WiMAX"
 #~ msgstr "WiMAX"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Uporabniškega vmesnika WiMAX ni mogoče naložiti."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Povezava WiMAX %d"
-
 #~ msgid "New Mobile Broadband (CDMA) connection..."
 #~ msgstr "Nova mobilna širokopasovna (CDMA) povezava ..."
 
@@ -5053,9 +5501,6 @@ msgstr "Vrs_ta:"
 #~ msgid "Error: %s"
 #~ msgstr "Napaka: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Ustvarjanje povezave DUN je spodletelo: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Telefon je pripravljen za uporabo!"
 
@@ -5093,15 +5538,6 @@ msgstr "Vrs_ta:"
 #~ msgid "%s Network"
 #~ msgstr "Omrežje %s"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "Glavni DNS:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "Drugi DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Tretji DNS:"
-
 #~ msgid "_Save..."
 #~ msgstr "_Shrani ..."
 
diff --git a/po/sq.po b/po/sq.po
index 6a518f14..1593037d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2004-09-15 11:49+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -16,225 +17,246 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "Lidhjet e rrjetit"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
 msgstr "Lidhjet e rrjetit"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Lidhjet e rrjetit"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr ""
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr ""
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr ""
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr ""
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr ""
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr ""
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr ""
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -242,7 +264,7 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -250,14 +272,14 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -265,49 +287,49 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -315,20 +337,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr ""
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +359,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -346,581 +368,606 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr ""
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr ""
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 #, fuzzy
 msgid "_VPN Connections"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr ""
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr ""
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 #, fuzzy
 msgid "Enable _Networking"
 msgstr "Ndrysho Rrjetet Wireless"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr ""
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr ""
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 #, fuzzy
 msgid "_About"
 msgstr "_Informacione..."
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr ""
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr ""
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr ""
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 #, fuzzy
 msgid "No network connection"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 #, fuzzy
 msgid "NetworkManager Applet"
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr ""
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr ""
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr ""
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr ""
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr ""
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr ""
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+msgid "Primary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Secondary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr ""
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr ""
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr ""
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr ""
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+msgid "Security"
 msgstr ""
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr ""
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Fjalëkalimi:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr ""
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr ""
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr ""
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -929,34 +976,34 @@ msgstr ""
 "Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
 "glade nuk u gjet)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 #, fuzzy
 msgid "Password:"
 msgstr "Fjalëkalimi:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -964,25 +1011,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -990,89 +1037,95 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+msgid "Connection had no VPN setting"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/applet-vpn-request.c:458
+#, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr ""
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
+
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1080,634 +1133,778 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+msgid "_Interface name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+msgid "_Primary"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+msgid "_Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr ""
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
+msgstr "Fjalëkalimi:"
+
+#: src/connection-editor/ce-page-dsl.ui:116
+msgid "PPP _interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:130
+msgid "P_arent interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+msgid "C_laim interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+msgid "C_loned MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+msgid "_Wake on LAN password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+msgid "_Speed"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1715,1109 +1912,1211 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+msgid "_Method"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
-msgstr ""
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
+msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+msgid "Allowed methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+msgid "Method"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:332
+msgid "_LACP port priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+msgid "Send _interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+msgid "Delay _before first send"
 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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+msgid "_Hardware Address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+msgid "_Hardware address policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+msgid "_Parent interface"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+msgid "VLAN inter_face name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+msgid "Cloned MAC _address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+msgid "S_ecurity"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
-msgid "Select file to import"
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -2826,248 +3125,290 @@ msgstr ""
 "Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
 "glade nuk u gjet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
-msgstr ""
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
+msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Informacione..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+msgid "Connection type not specified."
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "_Identifikohu në Rrjet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
@@ -3075,84 +3416,87 @@ msgstr ""
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+msgid "missing parent interface"
+msgstr ""
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr ""
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3160,269 +3504,266 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Lidhjet e rrjetit"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr ""
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr ""
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr ""
@@ -3430,175 +3771,173 @@ msgstr ""
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
+#: src/connection-editor/page-vpn.c:64
+#, c-format
+msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
+#: src/connection-editor/page-vpn.c:65
+msgid "unknown failure"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:122
-#, c-format
-msgid "Could not load editor VPN plugin for “%s” (%s)."
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
-msgid "unknown failure"
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Fjalëkalimi:"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3606,455 +3945,432 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr ""
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "Lidhjet e rrjetit"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Fjalëkalimi:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr ""
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Lidhjet e rrjetit"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-#, fuzzy
-msgid "New Mobile Broadband Connection"
-msgstr "Lidhjet e rrjetit"
-
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
-#, c-format
-msgid "%s certificate _password:"
-msgstr ""
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Fjalëkalimi:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
-msgid "Click to connect"
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
+msgid "Click to connect"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Nevoitet Kyçi i Rrjetit Wireless"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+msgid "Wi-Fi _security"
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+msgid "Wi-Fi _adapter"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4064,426 +4380,438 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Lidhjet e rrjetit"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "_Identifikohu në Rrjet"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr ""
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Lidhjet e rrjetit"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+msgid "_Inner authentication"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
+msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-peap.ui:26
+msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
-msgid "MD5"
+#: src/wireless-security/eap-method-peap.ui:29
+msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-msgid "Version 0"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
-msgid "Version 1"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "No CA certificate is _required"
+#: src/wireless-security/eap-method-simple.c:90
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-simple.c:106
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
-msgid "missing EAP username"
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
-msgid "missing EAP password"
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Fjalëkalimi:"
+
+#: src/wireless-security/eap-method-simple.ui:128
+msgid "Sh_ow passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
+#: src/wireless-security/eap-method-tls.ui:20
+msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+msgid "Au_thentication"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr ""
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr ""
+
+#: src/wireless-security/ws-wep-key.ui:54
+msgid "_Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+msgid "_Type"
 msgstr ""
 
 #, fuzzy
diff --git a/po/sr.po b/po/sr.po
index 7ab1725a..a0741e06 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2018-02-09 08:40+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
@@ -20,51 +20,60 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Управљајте вашим везама мреже"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Везе са мрежом"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Сирово подешавање"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Управљајте и измените подешавања ваших мрежних веза"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Искључивање обавештења о повезивању"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Укључите ову опцију да искључите обавештења када се повезујете на мрежу."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Искључивање обавештења о прекиду везе"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Укључите ову опцију да искључите обавештења када прекидате везу са мрежом."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Искључивање ВПН обавештења"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -72,48 +81,49 @@ msgstr ""
 "Укључите ову опцију да искључите обавештења када се повезујете на ВПН или "
 "када прекидате везу са њим."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Искључи обавештавања о доступним мрежама"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Укључите ову опцију да искључите обавештења о доступности бежичних мрежа."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Печат"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Ово одређује да ли треба превести подешавања на ново издање."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Онемогући образовање бежичне мреже"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Укључите ову опцију да искључите образовање адхок мрежа из Управника мрежама."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Приказује програмче у области обавештења"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Поништите избор да искључите приказивање програмчета у области обавештења."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Занемарује ЦА уверење"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -121,7 +131,7 @@ msgstr ""
 "Укључите ову опцију да искључите упозорења о ЦА уверењима у ЕАП потврђивању "
 "идентитета."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -129,15 +139,15 @@ msgstr ""
 "Укључите ову опцију да искључите упозорења о ЦА уверењима у другој фази ЕАП "
 "потврђивања идентитета."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Управник мреже"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Уређивач веза управника мреже"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -145,7 +155,7 @@ msgstr ""
 "Управник мреже је системска услуга за управљање и подешавање мрежних веза и "
 "уређаја."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -153,37 +163,37 @@ msgstr ""
 "Програм ум-уређивач-веза ради са Управником мреже да би направио и уредио "
 "постојеће профиле везе за Управника мреже."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Програмери управника мреже"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "класа објекта „%s“ нема својство са називом „%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "својство „%s“ класе објекта „%s“ није уписиво"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "својство творбе „%s“ за објекат „%s“ се не може поставити након творбе"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "„%s::%s“ није исправан назив својства; „%s“ није подврста Гобјекта"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "не могу да поставим својство „%s“ врсте „%s“ из вредности врсте „%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -192,81 +202,81 @@ msgstr ""
 "вредност „%s“ врсте „%s“ није исправна или је ван опсега за својство „%s“ "
 "врсте „%s“"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Потврђивање идентитета за 802.1X везу"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.c:209
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Повежи"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Име мреже:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ад-хок"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "обезбеди."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Нисам успео да додам/активирам везу"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Неуспело повезивање"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Неуспело прекидање везе уређаја"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Неуспело прекидање везе"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Неуспело активирање везе"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Не приказуј више ову поруку"
 
-#: ../src/applet.c:899
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +286,7 @@ msgstr ""
 "\n"
 "Прекинута је ВПН веза „%s“ због прекида везе у мрежи."
 
-#: ../src/applet.c:901
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -286,7 +296,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због прекида везе у мрежи."
 
-#: ../src/applet.c:903
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +305,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због неочекиваног искључења ВПН сервиса."
 
-#: ../src/applet.c:905
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +316,7 @@ msgstr ""
 "Не могу да успоставим ВПН везу „%s“ јер је ВПН сервис послао неодговарајућа "
 "подешавања."
 
-#: ../src/applet.c:907
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +325,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер је истекло време за повезивање."
 
-#: ../src/applet.c:909
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +334,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер ВПН сервис није покренут на време."
 
-#: ../src/applet.c:911
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +343,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ зато што не могу да покренем ВПН сервис."
 
-#: ../src/applet.c:913
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -342,7 +352,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер не постоје исправне ВПН лозинке."
 
-#: ../src/applet.c:915
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +361,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због неисправних ВПН лозинки."
 
-#: ../src/applet.c:920
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -360,7 +370,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“."
 
-#: ../src/applet.c:947
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -371,19 +381,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:949
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "ВПН веза је успешно успостављена.\n"
 
-#: ../src/applet.c:951
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Порука за ВПН пријаву"
 
-#: ../src/applet.c:959 ../src/applet.c:999
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Није успело повезивање на ВПН"
 
-#: ../src/applet.c:1003
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -397,7 +407,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -410,325 +420,323 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "уређај није спреман (недостаје фирмвер)"
 
-#: ../src/applet.c:1297
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "уређај није спреман"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "веза је прекинута"
 
-#: ../src/applet.c:1323
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Прекини везу"
 
-#: ../src/applet.c:1337
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "не могу да управљам уређајем"
 
-#: ../src/applet.c:1410
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Није пронађен ниједан мрежни уређај"
 
-#: ../src/applet.c:1464
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_ВПН везе"
 
-#: ../src/applet.c:1508
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "По_деси ВПН…"
 
-#: ../src/applet.c:1511
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Додај ВПН везу…"
 
-#: ../src/applet.c:1617
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Управљач мрежом није покренут…"
 
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Умрежавање искључено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Укључи _мрежне услуге"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Укључи _бежично мрежење"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Омогући _мобилне везе"
 
 #. Toggle notifications item
-#: ../src/applet.c:1862
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Прикажи обавештења"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1874
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Пода_ци о вези"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Уреди везе…"
 
-#: ../src/applet.c:1896
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/applet.c:2207
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Повезани сте на „%s“."
 
-#: ../src/applet.c:2247
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Мрежна веза је прекинута."
 
-#: ../src/applet.c:2550
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Припремам мрежну везу „%s“…"
 
-#: ../src/applet.c:2553
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Потребна је пријава корисника за успостављање везе „%s“…"
 
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Захтевам мрежну адресу за „%s“…"
 
-#: ../src/applet.c:2559
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Повезани сте преко везе „%s“"
 
-#: ../src/applet.c:2632
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Успостављам ВПН везу „%s“…"
 
-#: ../src/applet.c:2635
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Потребна је пријава корисника за успостављање ВПН везе „%s“…"
 
-#: ../src/applet.c:2638
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Захтевам ВПН мрежну адресу за „%s“…"
 
-#: ../src/applet.c:2641
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Повезани сте преко ВПН везе"
 
-#: ../src/applet.c:2691
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Нема мрежне везе"
 
-#: ../src/applet.c:3292
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Програмче управника мреже"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Погрешан ПУК код, контактирајте вашег провајдера."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Погрешан ПИН код, контактирајте вашег провајдера."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Шаљем код за откључавање…"
 
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобилна веза (%s)"
 
-#: ../src/applet-device-broadband.c:739
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобилна"
 
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Доступно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:805
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Нова мобилна, широкопојасна веза…"
 
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Веза успостављена"
 
-#: ../src/applet-device-broadband.c:820
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Повезани сте мобилном широкопојасном мрежом."
 
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Мобилна широкопојасна мрежа."
 
-#: ../src/applet-device-broadband.c:961
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Сада сте регистровани на кућну мрежу."
 
-#: ../src/applet-device-broadband.c:967
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Сада сте регистровани на мрежу пребацивања."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Повезани сте мобилном широкопојасном мрежом."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Припремам мобилну, широкопојасну везу „%s“…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Подешавам мобилну, широкопојасну везу „%s“…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Потребна је пријава корисника за повезивање у мобилној мрежи „%s“…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Повезани сте преко мобилне широкопојасне везе „%s“"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Аутоматска жичана веза"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Жичане мреже (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Жичане мреже"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Жичана мрежа"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Повезани сте на жичану мрежу."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Припремам везу преко жичане мрежу „%s“…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Подешавам везу преко жичане мрежу „%s“…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Потребна је пријава корисника за успостављање жичане везе „%s“…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Захтевам адресу за жичану мрежу „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Повезани сте преко жичане везе „%s“"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Потврђивање идентитета ДСЛ-а"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "У _реду"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Повежи се на скривену бежичну мрежу…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Направи _нову бежичну мрежу…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ништа)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Нисам успео да додам нову везу"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Недовољна овлашћења."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Бежичне мреже (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Бежична мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Бежична мрежа"
@@ -736,238 +744,252 @@ msgstr[1] "Бежичне мреже"
 msgstr[2] "Бежичне мреже"
 msgstr[3] "Бежична мрежа"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Бежична мрежа је искључена"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Бежична мрежа је искључена физичким прекидачем"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Још мрежа"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Доступне су бежичне мреже"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Користите изборник мреже да се повежете на бежичну мрежу"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Повезани сте на бежичну мрежу „%s“."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Припремам бежичну мрежну везу „%s“…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Подешавам везу преко бежичне мреже „%s“…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Потребна је пријава корисника за успостављање бежичне везе „%s“…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Захтевам адресу бежичне мреже за „%s“…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Повезани сте преко бежичне везе „%s“ : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Повезани сте преко бежичне везе „%s“"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Нисам успео да активирам везу"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Грешка при приказивању података о вези:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "ЛЕАП"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамички ВЕП"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "ВПА/ВПА2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Још адреса"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "ВЕП"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (основно)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Непозната"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "ИП адреса"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Адреса за емитовање"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Непозната"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Мрежна маска"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Примарни:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Секундарни ДНС:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Терцијарни ДНС:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 бежична (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "ГСМ (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "ЦДМА (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Опште"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Уређај"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Хардверска адреса"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драјвер"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Брзина"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Безбедност:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "ИПв4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Подразумевана рута"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "ИПв6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Занемарено"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Врућа тачка"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "ВПН врста"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "ВПН мрежни пролаз"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "ВПН корисничко име"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "ВПН банер"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Веза основе"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Нема исправних, покренутих веза!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -977,16 +999,16 @@ msgstr ""
 "Ауторска права © 2005-2008 Новел, Доо.\n"
 "и многи други сарадници заједнице и преводиоци"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Програмче обавештајне зоне за управљање мрежним уређајима и везама."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Веб страница Управника мрежом"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Филип Милетић\n"
@@ -997,7 +1019,7 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1005,33 +1027,33 @@ msgstr ""
 "Програмче Управник мреже не може да пронађе неке потребне ресурсе („.ui“ "
 "датотека није пронађена)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Недостају ресурси"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Лозинка мобилне широкопојасне мреже"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Потребна је лозинка за повезивање на „%s“."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Потребно је откључати СИМ ПИН"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Потребно је откључати СИМ ПИН"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1039,25 +1061,25 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПИН код."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "ПИН кôд:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Прикажи ПИН кôд"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Потребно је откључати СИМ ПУК"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Потребно је откључати СИМ ПУК"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,43 +1087,41 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПУК кôд."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "ПУК кôд:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Нови ПИН кôд:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Поново унесите ПИН кôд:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Прикажи ПИН/ПУК кôдове"
 
-#: ../src/applet-vpn-request.c:201
-#| msgid "Connection cannot be deleted"
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Веза нема ВПН подешавање"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Нисам успео да запишем везу на ВПН корисничко сучеље: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Нисам успео да запишем везу на ВПН корисничко сучеље: непотпуно писање"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1109,56 +1129,56 @@ msgstr ""
 "ИП адресе за препознавање вашег рачунара унутар мреже. Кликните на дугме "
 "„Додај“ за унос ИП адресе."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Додај"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Занемари аутоматски добијене руте"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Користи ову везу само за изворе на сопственој мрежи"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "Уколико је укључено, ова веза никада неће бити у коришћена као подразумевана."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "_Направи…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Изаберите врсту везе"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1170,84 +1190,100 @@ msgstr ""
 "Ако правите ВПН везу, а иста се не појављује на списку, можда немате "
 "инсталиран исправан ВПН прикључак."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Уређај:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Кружно мењање"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Радна резерва"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "ИксОР"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Емитовање"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ад"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Прилагодљиво уравнотежење учитавања преноса"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Прилагодљиво уравнотежење учитавања"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "МИИ (препоручено)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "АРП"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Привезане _везе:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Режим:"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Учесталост _праћења:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Уређај:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Праћење везе:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "АРП _мете:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1255,19 +1291,22 @@ msgstr ""
 "ИП адреса, или списак зарезом раздвојених ИП адреса, које ће бити потражене "
 "приликом провере стања везе."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Застој _повезивања:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Застој _развезивања:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Примарни:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1275,66 +1314,76 @@ 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: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:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "_МТУ:"
 
-#: ../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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "бајта"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Трошак _путање:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Важност:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Режим укоснице:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Премошћене _везе:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Застој _прослеђивања:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Време поздрава:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Застој СТП прослеђивања, у секундама"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Време СТП поздрава, у секундама"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Укључи И_ГМП њушкање"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1344,16 +1393,17 @@ msgstr ""
 "њушкање аутоматски искључено због сукоба хеша, систем може одбити да укључи "
 "ову функцију све док се сукоби не реше."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Укључи _СТП (Протокол обухватног дрвета)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
-msgstr "Контролише да ли је Протокол стабла раширења (СТП) укључен за овај мост"
+msgstr ""
+"Контролише да ли је Протокол стабла раширења (СТП) укључен за овај мост"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1361,27 +1411,30 @@ msgstr ""
 "СТП приоритет за овај мост. Ниже вредности су „боље“; мост са нижим "
 "приоритетом биће изабран за корени мост."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Највеће време:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Највеће трајање СТП поруке, у секундама"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Време _старења:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Време трајања Етернет МАК адресе, у секундама"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+#: src/connection-editor/ce-page-bridge.ui:490
+#, fuzzy
+msgid "Group _forward mask"
 msgstr "Групиши маску за _напред:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1392,40 +1445,40 @@ msgstr ""
 "до 01:80:C2:00:00:0F која мора бити прослеђена. Маска не може имати подешене "
 "битове 0, 1 или 2 јер се користе за кадрове СТП, МАК паузе и ЛАЦП."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "аутоматски"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "основно"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "непозната грешка"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Очувај"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Трајно"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Насумично"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Стабилно"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1434,188 +1487,228 @@ msgstr ""
 "Унета МАК адреса се користи као адреса мрежног уређаја. Ова могућност се "
 "назива МАК клонирање или спуфинг. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "МАЦ адреса"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "ХВ адреса"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "неисправно %s за %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "неисправно %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "неисправан назив сучеља за %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "неисправан назив сучеља (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "не могу да обрадим назив уређаја"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "неисправна хардверска адреса"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "неисправно „%s“ (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "уређај"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "неисправно „%s“ (%s) "
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Не могу да ажурурам лозинке везе због непознате грешке."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Користи премошћавање центра података (ДЦБ) за ову везу"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "ФЦоЕ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "иСЦСИ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "ФИП"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Контрола тока"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Функција"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Укључи"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Обавести"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Приправан"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Важност"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Опције…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Групе важности"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Састав"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "ВН2ВН"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Контрола тока важности"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Укључите или искључите важност паузе преноса за сваку корисничку важност."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Важност:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Разред саобраћаја:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Изричита појасна ширина:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Појасна ширина важности:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Појасна ширина групе:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "ИБ групе:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Упишите ИБ групе важности за сваку корисничку важност."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1623,35 +1716,36 @@ msgstr ""
 "Упишите дозвољени проценат појасне ширине везе који свака група важности "
 "може да користи. Збир свих група мора бити 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Упишите проценат појасне ширине групе важности који свака корисничка важност "
 "може да користи."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Укључите или искључите изричиту појасну ширину за сваку корисничку важност."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Упишите разред саобраћаја за сваку корисничку важност."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Корисничко име:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Корисничко име коришћено за потврђивање идентитета са ПППоЕ услугом."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1659,180 +1753,191 @@ msgstr ""
 "Покреће само сесије са концентраторима приступа који пружају одређену "
 "услугу. За већину провајдера то треба оставити празно."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "С_ервис:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Прикажи _лозинку"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Лозинка коришћена за потврђивање идентитета са ПППоЕ услугом."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Лозинка:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
-#| msgid "_Parent interface:"
-msgid "PPP _interface:"
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
 msgstr "ППП _уређај:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
-#| msgid "_Parent interface:"
-msgid "P_arent interface:"
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
 msgstr "_Родитељски уређај:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Произвољно име за додељивање новоствореном ППП сучељу."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Сучеље на коме ће бити успостављена ППП веза."
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Родитељски уређај:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Уплетени пар (ТП)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Сучеље јединице прикачињања (АУИ)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "БНЦ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Сучеље независног медија (МИИ)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 MB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 MB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 GB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 GB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Пола"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Потпуно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Занемари"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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:191
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ручно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Порт:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
-msgstr "_Уређај:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "_Клонирана МАК адреса:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "Пробуди на ЛАН-у:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Основно"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Занемари"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Физички"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "За _једну"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "За _више"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "За _све"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_ПРА"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "_Магично"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "_Пробуди са ЛАН лозинком:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "Пробуди-са-ЛАН лозинком (жичани МАК). Важи само за магичне пакете."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+#, fuzzy
+msgid "Lin_k negotiation"
 msgstr "Преговор _везе:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1842,11 +1947,12 @@ msgstr ""
 "„Дуплекс“ биће приморани без провере погодности уређаја. Ако нисте сигурни, "
 "оставите овде „Занемари“ или изаберите „Самостално“."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Брзина:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1856,11 +1962,12 @@ msgstr ""
 "опције „Занемари“ и „Самостално“. Пре него што наведете вредност брзине "
 "будите сигурни да је ваш уређај подржава."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
-msgid "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+#, fuzzy
+msgid "Duple_x"
 msgstr "_Дуплекс:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1870,23 +1977,48 @@ msgstr ""
 "изабране опције „Занемари“ и „Самостално“. Пре него што наведете режим "
 "дуплекса будите сигурни да је ваш уређај подржава."
 
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "Сам се повежи на _ВПН када користиш ову везу"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ништа"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Сви _корисници могу да се повежу на ову мрежу"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Сам се повежи на ову мрежу када је доступна"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Сам се повежи на _ВПН када користиш ову везу"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "Област _мрежне баријере:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Тимске везе:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
-msgstr "_Приоритет везе за самостално активирање:"
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Занемари аутоматски добијене руте"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1895,11 +2027,7 @@ msgstr ""
 "Приоритет везе за самостално активирање. Везе са већим бројем имају предност "
 "приликом избора профила за самостално активирање. Основна вредност је 0."
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "Област _мрежне баријере:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1908,7 +2036,7 @@ msgstr ""
 "„Додај“ да додате статичку ИП адресу како би била подешена као додатак "
 "самосталној."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1919,126 +2047,133 @@ msgstr ""
 "која се додељује другим рачунарима. Кликните на дугме „Додај“ да додате ИП "
 "адресу. Ако није дата ниједна адреса, опсег се одређује самостално."
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Додатне статичке адресе"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адресе"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Адреса (изборно)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Датаграм"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
 msgstr "Режим _преноса:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "ИПИП"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "ГРЕ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "СИТ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ИСАТАП"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "ВТИ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "ИП6ИП6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "ИПИП6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "ИП6ГРЕ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "ВТИ6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
 msgstr "Назив уређаја:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
 msgstr "Родитељски уређај:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
-msgid "Mode:"
-msgstr "Режим:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+msgid "Mode"
+msgstr "Режим"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+#, fuzzy
+msgid "Local IP"
 msgstr "Месни ИП:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+#, fuzzy
+msgid "Remote IP"
 msgstr "Удаљени ИП:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+#, fuzzy
+msgid "Input key"
 msgstr "Улазни кључ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+#, fuzzy
+msgid "Output key"
 msgstr "Излазни кључ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU:"
-msgstr "МТУ:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
+msgid "MTU"
+msgstr "МТУ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Аутоматски са ручним ДНС подешавањем"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Вежи-локално"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:211
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Подељено са осталим рачунарима"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Метод:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2048,8 +2183,8 @@ msgstr ""
 "подешавања вашег рачунара. Уколико желите да користите ову могућност, "
 "унесите назив ДХЦП програма."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2057,25 +2192,26 @@ msgstr ""
 "Домени за разрешење назива домаћина. Користите тачке да раздвојите више "
 "домена."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "_ИБ ДХЦП клијента:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Домени _претраге:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_ДНС сервери:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2083,11 +2219,11 @@ msgstr ""
 "ИП адресе сервера домена за разрешење назива домаћина. Користите тачке да "
 "раздвојите више адреса."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Захтева ИПв_4 адресирање за успостављање везе"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2095,35 +2231,34 @@ msgstr ""
 "При повезивању на ИПв6 кабловске мреже дозвољава успостављање везе уколико "
 "не раде ИПв4 подешавања, а раде ИПв6 подешавања."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Руте…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Искључено"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Укључено (првенство јавној адреси)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Укључено (првенство привременој адреси)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#| msgid "Stable"
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Стабилна приватност"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2133,19 +2268,21 @@ msgstr ""
 "раздвојите више адреса сервера домена. Адресе месне везе биће самостално "
 "убачена у опсег уређаја за повезивање."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Проширења ИПв6 _приватности:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+#: src/connection-editor/ce-page-ip6.ui:319
+#, fuzzy
+msgid "IPv6 address _generation mode"
 msgstr "Режим _стварања ИПв6 адресе:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Захтева ИПв_6 адресирање за успостављање везе"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2153,28 +2290,28 @@ msgstr ""
 "При повезивању на ИПв4 кабловске мреже дозвољава успостављање везе уколико "
 "не раде ИПв6 подешавања, а раде ИПв4 подешавања."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "ПСК"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "ЕАП"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Провери"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Изричито"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Назив „MACsec“ уређаја."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2182,7 +2319,7 @@ msgstr ""
 "Назив родитељског сучеља или УУИД родитељске везе са којих ово МАКСЕЦ сучеље "
 "треба да се направи."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2190,15 +2327,15 @@ msgstr ""
 "Назив родитељског сучеља или УУИД родитељске везе са којих ово МАКсец сучеље "
 "треба да се направи"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Пред-дељени назив кључа придруживања повезивости"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Пред-дељени кључ придруживања повезивости"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2208,200 +2345,216 @@ msgstr ""
 "сагласност кључа). За ЕАП режим, попуните параметре на безбедносној страници "
 "802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#: src/connection-editor/ce-page-macsec.ui:154
+#, fuzzy
+msgid "CKN"
 msgstr "ЦКН:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#: src/connection-editor/ce-page-macsec.ui:167
+#, fuzzy
+msgid "CAK"
 msgstr "ЦАК:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#: src/connection-editor/ce-page-macsec.ui:191
+#, fuzzy
+msgid "Keys"
 msgstr "Тастери:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#: src/connection-editor/ce-page-macsec.ui:207
+#, fuzzy
+msgid "Parameters"
 msgstr "Параметри:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#: src/connection-editor/ce-page-macsec.ui:224
+#, fuzzy
+msgid "Validation"
 msgstr "Потврђивање:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
 msgstr "СЦИ порт:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Наводи режим потврђивања за долазне кадрове"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Да ли пренесени саобраћај мора бити шифрован"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Састојак порта за СЦИ (безбедни одредник канала)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Основнo"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Број:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Напредно"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_АПН:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_ИБ мреже:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Измени…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "_ПИН:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Дозволи _роминг уколико нема домаће мреже"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Прикажи _лозинке"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Дозвољени начини:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Подеси _начине…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Сажимање"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Користи шифровање „тачка-до-тачке“ (МППЕ)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Захтева 128-битно шифровање"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Користи _речит МППЕ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Дозволи _БСД паковање података"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Дозволи _Дефлејт паковање података"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Користи _паковање ТЦП заглавља"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Ехо"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Шаљи ППП _ехо пакете"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Само за прегледника"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Користите ово подешавање посредника за само за клијенте/шеме прегледника."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+#, fuzzy
+msgid "PAC URL"
 msgstr "ПАЦ адреса:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:64
+#, fuzzy
+msgid "PAC script"
 msgstr "ПАЦ скрипта:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "Адреса са које ће се узети ПАЦ скрипта."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Увези скрипту из датотеке…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
 msgstr "Метод:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Напредно…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Подеси главним"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Стање жичаног порта"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr "АРП (ИПв4)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr "НДП (ИПв6)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Напредне опције тима"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+#, fuzzy
+msgid "_Queue ID"
 msgstr "_ИБ реда:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2409,20 +2562,21 @@ msgstr ""
 "Број излива нежељених НАс и бесплатних АРП пакета који се шаљу након "
 "укључивања или искључивања порта."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "ИБ реда на који овај порт треба бити мапиран."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Опције покретача активне резерве"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "_Port priority:"
+#: src/connection-editor/ce-page-team-port.ui:271
+#, fuzzy
+msgid "_Port priority"
 msgstr "_Хитност порта:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2430,37 +2584,34 @@ msgstr ""
 "Вредност је позитиван број у милисекундама. Наводи интервал између излива "
 "пакета обавештења о парњаку."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Важност порта. Већи број значи већу хитност."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "_Лепљив порт"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
-"Проверава примљене АРП пакете на активним портовима. Ако ово није изабрано, "
-"сви долазећи АРП пакети ће се сматрати добрим одговором."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Опције ЛАЦП покретача"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
 msgstr "_Хитност ЛАЦП порта:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+msgid "LACP port _key"
 msgstr "Кључ ЛАЦП _порта:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2468,15 +2619,15 @@ msgstr ""
 "Број излива захтева за придруживање мултикаст групи након укључивања или "
 "искључивања порта."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 "Хитност порта у складу са ЛАЦП стандардом. Мањи број значи већу хитност."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2484,7 +2635,7 @@ msgstr ""
 "Вредност је позитиван број у милисекундама. Наводи интервал између излива "
 "захтева за придруживање мултикаст групи."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2492,48 +2643,56 @@ msgstr ""
 "Кључ порта према ЛАЦП стандарду. Могуће је сјединити портове само са истим "
 "кључем."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+#, fuzzy
+msgid "_Link watcher"
 msgstr "Посматрач _везе:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+#, fuzzy
+msgid "_Up delay"
 msgstr "Застој _слања:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+#, fuzzy
+msgid "_Down delay"
 msgstr "Застој _примања:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+#, fuzzy
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+#, fuzzy
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+#, fuzzy
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
 msgstr "Домаћин _извора:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+#, fuzzy
+msgid "_Target host"
 msgstr "Домаћин _циља:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2541,8 +2700,8 @@ msgstr ""
 "Највећи број пропуштених одговора. Ако се превазиђе овај број, веза се "
 "означава палом."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2550,8 +2709,8 @@ msgstr ""
 "Назив домаћина који ће бити претворен у ИП адресу која ће бити попуњена у "
 "АРП захтеву као адреса извора."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2559,18 +2718,27 @@ msgstr ""
 "Назив домаћина који ће бити претворен у ИП адресу која ће бити попуњена у "
 "захтеву као адреса одредишта."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2578,13 +2746,13 @@ msgstr ""
 "Проверава примљене АРП пакете на неактивним портовима. Ако ово није "
 "изабрано, сви долазећи АРП пакети ће се сматрати добрим одговором."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2592,157 +2760,163 @@ msgstr ""
 "По основи, АРП захтеви се шаљу само на активним портовима. Ова опција "
 "омогућава слање чак и на неактивним портовима."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Осматрач везе"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Увези тимско _подешавање из датотеке…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
 msgstr "Уреди _ЈСОН подешавање:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Сирово подешавање"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Највећа хитност"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Највећа хитност (стабилно)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Појасна ширина"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Највећи број портова"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Хитност порта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Са тимског уређаја"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Са активног порта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Са активног на тимски уређај"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Тимске везе:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Равнотежа учитавања"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "ЛАЦП"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Жичана веза"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "ВЛАН"
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "ИП"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Неки Л3 протокол"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "ТЦП"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "УДП"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "СЦТП"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Неки Л4 протокол"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+#, fuzzy
+msgid "_Peer notification count"
 msgstr "Број обавештења _парњака:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+#, fuzzy
+msgid "Peer _notification interval"
 msgstr "Интервал _обавештења парњака:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+#, fuzzy
+msgid "_Multicast rejoin count"
 msgstr "_Број мултикаст придруживања:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+#, fuzzy
+msgid "Multicast _rejoin interval"
 msgstr "_Интервал мултикаст придруживања:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "_Хардверска адреса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2750,19 +2924,21 @@ msgstr ""
 "Жељена хардверска адреса новог тимског уређаја. Уобичајени запис МАК адресе "
 "је прихватљив."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+#: src/connection-editor/ce-page-team.ui:798
+#, fuzzy
+msgid "_Runner"
 msgstr "_Покретач:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
 msgstr "Политика _хардверске адресе:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Назив покретача за коришћење."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2770,11 +2946,11 @@ msgstr ""
 "Ово одређује политику начина подешавања хардверских адреса тимског уређаја и "
 "уређаја порта за време трајања тима."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "ЛАЦПДУ кадрове пошаљи _повремено"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2782,11 +2958,11 @@ msgstr ""
 "Ако је изабрано, ЛАЦПДУ кадрови се шаљу повремено са подешеним везама. Ако "
 "није, делује као „говори када ти се обрате“."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "ЛАЦПДУ кадар пошаљи _сваке секунде"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2796,23 +2972,26 @@ msgstr ""
 "ЛАЦПДУ пакета. Ако је изабрано, пакети ће бити послати један у секунди. У "
 "супротном ће бити послати на сваких 30 секунди."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
-msgid "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+#, fuzzy
+msgid "_System priority"
 msgstr "Хитност _система:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+#, fuzzy
+msgid "_Minimum ports"
 msgstr "_Најмање портова:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+#, fuzzy
+msgid "_Aggregator selection policy"
 msgstr "Политика избора _сакупљача:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Хитност система, може бити од 0–65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2820,11 +2999,11 @@ msgstr ""
 "Одређује најмањи број портова који морају бити активни пре потврђивања "
 "носача у главном сучељу, вредност може бити од 1—255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Ово бира политику начина избора сакупљача."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2832,190 +3011,200 @@ msgstr ""
 "Списак врста одломака (ниски) које би требало да се користе за прорачун хеша "
 "Tx пакета."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Поља за хеш преноса"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "У десетим деловима секунде. Повремени интервал између поновног "
 "уравнотежавања."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Назив активног Tx уравнотежавача. Активно Tx уравнотежавање је унапред "
 "искључено."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
-msgid "Transmission _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
 msgstr "Интервал _уравнотежавања преноса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
 msgstr "Уравнотежавач _преноса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Покретач"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Родитељски уређај:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "Назив _ВЛАН уређаја:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "_Клонирана МАК адреса:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_ИБ ВЛАН-а:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Заставице:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Преуреди заглавља"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_ГВРП"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Напусти свезивања"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "М_ВРП"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Назив уређаја + број"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "„влан“ + број"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "Б_езбедност:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Клијент"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Врућа тачка"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ад-хок"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Јачина преноса:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Проток:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_БССИД:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Канал:"
 
 # Ваљда се односи на опсег, а?
 # ~Милош
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Опсег:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "СС_ИД:"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Нема овлашћења полкита за обављање радње"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Дозвољени начини потврђивања идентитета"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_ЕАП"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Надоградив протокол за пријаву"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_ПАП"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Протокол за пријаву путем лозинке"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "Ц_ХАП"
 
 # Разлупавам се :)
 # ~Милош
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Протокол за пријаву изазовним руковањем"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_МСЦХАП"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Мајкрософтов протокол за пријаву изазовним руковањем"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "МСЦХАП в_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Мајкрософтов протокол за пријаву изазовним руковањем, 2. издање"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3023,196 +3212,180 @@ msgstr ""
 "У већини случајева, ППП сервери добављача ће подржати све начине потврђивања "
 "идентитета. Ако веза не успе, покушајте да искључите подршку за неке начине."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Бежична"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Блутут"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "ДСЛ/ПППоЕ"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Инфини банд"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Веза"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Тим"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:233
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "ИП тунел"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "МАЦсец"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "ВПН"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Прикључак за ВПН не може да увезе ВПН везе\n"
-"\n"
-"Грешка: није изабрана врста ВПН сервиса."
 
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Не могу да увезем ВПН везу"
-
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Не могу да прочитам датотеку „%s“ или она не садржи познате ВПН податке о "
-"вези\n"
+"Прикључак за ВПН не може да увезе ВПН везе\n"
 "\n"
-"Грешка: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "непозната грешка"
+"Грешка: није изабрана врста ВПН сервиса."
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Изаберите датотеку за увоз"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Отвори"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Виртуелно"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Увези сачувна ВПН подешавања…"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Не могу да покренем прозорче за измену везе због непознате грешке."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не могу да направим нову везу"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Не могу да обришем везу"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Да ли да заиста обришем везу %s?"
 
-#: ../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:1118
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_ВПН везе"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Мрежна маска"
 
-#: ../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:1156
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Мрежни пролаз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрички"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Уређујем %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Уређујем неименовану везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Недостаје назив везе"
 
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Покретање уређивача…"
 
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Веза не може бити измењена"
 
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Неисправно подешавање %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3220,32 +3393,32 @@ msgstr ""
 "Програм за уређивање веза не може да пронађе неке од потребних ресурса (није "
 "нађена „.ui“ датотека)."
 
-#: ../src/connection-editor/nm-connection-editor.c:574
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Сачувај све промене у овој вези."
 
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Пријавите се како би сачували ову везу за све кориснике рачунара."
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Не могу да направим везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не могу да уредим везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Непозната грешка стварања прозорчета за уређивање веза."
 
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3253,19 +3426,19 @@ msgstr ""
 "Упозорење: веза садржи нека својства која нису подржана од стране уређивача. "
 "Биће обрисана након чувања."
 
-#: ../src/connection-editor/nm-connection-editor.c:755
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Грешка у покретању уређивача"
 
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Није успело додавање везе"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Поправи"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3273,23 +3446,24 @@ msgstr ""
 "Безбедносне ознаке могу спречити коришћење неких датотека са потврђивањем "
 "идентитета уверења."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Назив _везе:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Извези…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Поновно означавање датотеке"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Поново означи"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3297,25 +3471,25 @@ msgstr ""
 "Следеће датотеке нису означене за коришћење са потврђивањем идентитета "
 "уверења. Да ли желите да одрадите ознаке?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Поново означи"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "никад"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "сада"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3324,7 +3498,7 @@ msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 msgstr[3] "пре %d минут"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3333,7 +3507,7 @@ msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 msgstr[3] "пре %d сат"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3342,7 +3516,7 @@ msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 msgstr[3] "пре %d дан"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3351,7 +3525,7 @@ msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 msgstr[3] "пре %d месец"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3360,134 +3534,159 @@ msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 msgstr[3] "пре %d године"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Веза не може бити обрисана"
 
-#: ../src/connection-editor/nm-connection-list.c:448
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Изаберите везу за уређивање"
 
-#: ../src/connection-editor/nm-connection-list.c:450
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Изаберите везу за брисање"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назив"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Употрбљена"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Уређује податке за изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Пријавите се како би изменили изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Брише изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Пријавите се како би обрисали изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Није подржана ова врста мобилне, широкопојасне мреже."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Не знам како да направим „%s“ везу"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Грешка приликом уређивања везе"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Грешка приликом стварања везе"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Веза не може бити измењена"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Нису инсталирани ВПН прикључци."
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Не знам како да направим „%s“ везу"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Грешка приликом уређивања везе"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Нисам нашао везу која има УУИД „%s“"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Везе са мрежом"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Додајте нову везу"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Безбедност 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Не могу да учитам безбедносно корисничко сучеље за 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Користи 802.1_X безбедност за ову везу"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "МАК адреса Блутут уређаја. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Не могу да учитам корисничко сучеље блутута."
 
-#: ../src/connection-editor/page-bluetooth.c:173
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "неисправан блутут уређај (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:256
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Блутут веза „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:306
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Врста блутута"
 
-#: ../src/connection-editor/page-bluetooth.c:324
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Изаберите врсту профила блутут везе."
 
-#: ../src/connection-editor/page-bluetooth.c:329
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Мрежа _личног домена"
 
-#: ../src/connection-editor/page-bluetooth.c:334
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Мрежа _двојне парице"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Не могу да учитам корисничко сучеље свезе."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "примарни"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Веза свезе %d"
 
-#: ../src/connection-editor/page-bridge.c:236
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Не могу да учитам корисничко сучеље моста."
 
-#: ../src/connection-editor/page-bridge.c:352
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Веза моста %d"
@@ -3495,37 +3694,36 @@ msgstr "Веза моста %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Прикључник моста"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Не могу да учитам корисничко сучеље прикључника моста."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "ДЦБ"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Не могу да учитам ДЦБ корисничко сучеље."
 
-#: ../src/connection-editor/page-dsl.c:203
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Не могу да учитам корисничко сучеље за DSL."
 
-#: ../src/connection-editor/page-dsl.c:298
-#| msgid "_Parent interface:"
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "недостаје родитељски уређај"
 
-#: ../src/connection-editor/page-dsl.c:343
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "ДСЛ веза „%d“"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3535,41 +3733,40 @@ msgstr ""
 "називом или трајном МАК адресом или са оба. Нпр: „em1“, „3C:97:0E:42:1A:19“, "
 "„em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "занемарено"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Не могу да учитам корисничко сучеље за жичану мрежу."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Уређај жичане везе"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "клониран МАК"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Пробуди са ЛАН лозинком"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Жичана веза %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Подразумевана"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3579,11 +3776,11 @@ msgstr ""
 "бирање доводи до коришћења задате области подешене у мрежној баријери. Може "
 "се користити само ако је покренут демон мрежне баријере (firewalld)."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Не могу да учитам опште корисничко сучеље."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3595,166 +3792,160 @@ msgstr ""
 "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:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Не могу да учитам корисничко сучеље Инфини банда."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "инфинибанд уређај"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Инфини банд веза %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Не могу да учитам корисничко сучеље ИП тунела."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "ИП тунел веза %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Самостално (ВПН)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Само самосталне (ВПН) адресе"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Аутоматски, само адресе"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Самостално (ПППоЕ)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Само самосталне (ПППоЕ) адресе"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Самостално (ДХЦП)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Само самосталне (ДХЦП) адресе"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Само вежи-локално"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Додатни _ДНС сервери:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Додатни домени _претраге:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Уређујем ИПв4 руте за %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "ИПв4 подешавања"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Не могу да учитам ИПв4 корисничко сучеље."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "ИПв4 адреса „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "ИПв4 мрежна маска адресе „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "ИПв4 мрежни пролаз „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "ИПв4 ДНС сервер „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Аутоматски, само ДХЦП"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Уређујем ИПв6 руте за %s"
 
-#: ../src/connection-editor/page-ip6.c:1208
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "ИПв6 подешавања"
 
-#: ../src/connection-editor/page-ip6.c:1210
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Не могу да учитам ИПв6 корисничко сучеље."
 
-#: ../src/connection-editor/page-ip6.c:1302
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "ИПв6 адреса „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip6.c:1310
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "ИПв6 префикс „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:1319
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "ИПв6 мрежни пролаз „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:1361
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "ИПв6 ДНС сервер „%s“ је неисправан"
 
-#: ../src/connection-editor/page-macsec.c:192
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Не могу да учитам МАЦсец корисничко сучеље."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "МАКСЕЦ веза %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Умножи подређене"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Оба подређена „%s“ и „%s“ се примењују на уређај „%s“"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3763,25 +3954,25 @@ msgstr ""
 "Подређени „%s“ и „%s“ се примењују на различите виртуелне прикључнике („%s“ "
 "и „%s“) истог физичког уређаја."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s подређује %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Не могу да учитам корисничко сучеље за мобилну, широкопојасну мрежу."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Није подржана ова врста мобилне, широкопојасне мреже."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изаберите врсту мобилног широкопојасног издавача"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3789,84 +3980,84 @@ msgstr ""
 "Изаберите технологију коју користи ваш издавач мобилних широкопојасних "
 "услуга. Уколико нисте сигурни, питајте издавача."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Мој издавач користи _ГСМ технологије (нпр. ГПРС, ЕДГЕ, УМТС, ХСДПА)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мој издавач користи Ц_ДМА технологије (нпр. 1xРТТ, ЕВДО)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "ЦДМА"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "ГСМ"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "ПАП"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "ЦХАП"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "МСЦХАПв2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "МСЦХАП"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ништа"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Уређујем ППП начине пријаве за %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "ППП подешавања"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Не могу да учитам ППП корисничко сучеље."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Посредник"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Не могу да учитам корисничко сучеље посредника."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Грешка: датотека не садржи исправно ЈСОН подешавање"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Не могу да учитам тимско корисничко сучеље."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Тимска веза „%d“"
@@ -3874,68 +4065,67 @@ msgstr "Тимска веза „%d“"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Тимски прикључник"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (путем „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Нова веза…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Не могу да учитам корисничко сучеље влан-а."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "влан надређени"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "ВЛАН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:67
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не могу да учитам ВПН прикључак уређивача за „%s“ (%s)."
 
-#: ../src/connection-editor/page-vpn.c:68
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "непознат неуспех"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Не могу да учитам ВПН корисничко сучеље."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Не могу да нађем ВПН прикључак за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:202
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "ВПН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:208
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Избор врсте ВПН везе"
 
-#: ../src/connection-editor/page-vpn.c:209
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3945,7 +4135,7 @@ msgstr ""
 "врста ВПН везе коју желите да направите не појави на списку, можда немате "
 "инсталиран исправан ВПН прикључак."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -3953,7 +4143,7 @@ msgstr ""
 "Ова опција додељује ову везу тачки бежичног приступа (АП) која је наведена "
 "овде унетим БССИД-ом. Нпр: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -3963,95 +4153,93 @@ msgstr ""
 "називом или трајном МАК адресом или са оба. Нпр: „wlan0“, "
 "„3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не могу да учитам корисничко сучеље за бежичну мрежу."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "бссид"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Бежични уређај"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Бежична веза %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "ВЕП 40/128-битни кључ (Хекс или АСКРИ)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамички ВЕП (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Лични ВПА & ВПА2"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Пословни ВПА & ВПА2"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не могу да учитам безбедносно корисничко сучеље за бежичну мрежу; недостају "
 "подешавања бежичне мреже."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Бежична безбедност"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не могу да учитам безбедносно корисничко сучеље за бежичну мрежу."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "недостаје ССИД"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Безбедност није сагласна са ад-хок режимом"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Већ постоји датотека „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Да ли желите да замените %s ВПН везом пре чувања?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не могу да извезем ВПН везу"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4062,218 +4250,103 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Извези ВПН везу…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Откључај"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Самостално откључајте овај уређај"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Подаци о вези"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Активне везе мреже"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Није подешено уверење"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Није подешен кључ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Изаберите кључ за „%s“ уверење"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "„%s“ приватни _кључ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "„%s“ _лозинка кључа:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Изаберите „%s“ уверење"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "„%s“ _уверење:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Ваша мобилна широкопојасна веза је подешена са следећим параметрима:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Ваш уређај:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Ваш повајдер:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Ваш план:"
-
-#: ../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."
-msgstr ""
-"Сада ће бити направљена веза са вашим издавачем мобилних широкопојасних "
-"услуга на основу подешавања које сте унели. Уколико не успете да се повежете "
-"на мрежу, проверите поново унета подешавања. За измену подешавања, изаберите "
-"„Везе са мрежом“ из изборника Систем → Поставке."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Потврдите мобилну широкопојасну везу"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Моја земља није на списку"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Неизлистано"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Изабери мој план:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Изабрани _НТП план (Назив тачке приступа):"
-
-#: ../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."
-msgstr ""
-"Упозорење: Избор неисправног плана може да утиче на начин плаћања "
-"широкопојасне мреже или да онемогући повезивање.\n"
-"\n"
-"Уколико нисте сигурни за начин плаћања затражите АПН план од издавача "
-"Интернет услуге."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Изаберите план наплате"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Мој план није на списку…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Изабери издавача Интернет услуга са _списка:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Достављач"
 
-#: ../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:"
-msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Издавач:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Мој издавач користи ГСМ (ГПРС, ЕДГЕ, УМТС, ХСПА)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Мој издавач користи ЦДМА (1xРТТ, ЕВДО)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Изаберите издавача услуга"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Списак држава или региона:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Држава или регион"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Моја земља није на списку"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
-msgstr "Изаберите државу или регион вашег достављача услуга"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталиран ГСМ уређај"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталиран ЦДМС уређај"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Било који уређај"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Нова мобилна, широкопојасна веза"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4281,216 +4354,289 @@ msgstr ""
 "Овај чаробњак ће вам помоћи да лако подесите мобилну широкопојасну везу са "
 "3Г мрежом."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Потребни су вам следећи подаци:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Име издавача широкопојасне услуге"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Име широкопојасног плана наплате"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(у неким случајевима) ваш план широкопојасне наплате за АПН (Назив тачке "
 "приступа)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Направи везу за _овај мобилни, широкопојасни уређај:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Било који уређај"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Подеси мобилну, широкопојасну везу"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Нова мобилна, широкопојасна веза"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Држава или регион"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
+msgstr "Изаберите државу или регион вашег достављача услуга"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Изабери издавача Интернет услуга са _списка:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мој издавач користи ГСМ (ГПРС, ЕДГЕ, УМТС, ХСПА)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мој издавач користи ЦДМА (1xРТТ, ЕВДО)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Изаберите издавача услуга"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Изабери мој план:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Изабрани _НТП план (Назив тачке приступа):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+"Упозорење: Избор неисправног плана може да утиче на начин плаћања "
+"широкопојасне мреже или да онемогући повезивање.\n"
+"\n"
+"Уколико нисте сигурни за начин плаћања затражите АПН план од издавача "
+"Интернет услуге."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Изаберите план наплате"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Ваша мобилна широкопојасна веза је подешена са следећим параметрима:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Ваш уређај:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Ваш повајдер:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Ваш план:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
+"Сада ће бити направљена веза са вашим издавачем мобилних широкопојасних "
+"услуга на основу подешавања које сте унели. Уколико не успете да се повежете "
+"на мрежу, проверите поново унета подешавања. За измену подешавања, изаберите "
+"„Везе са мрежом“ из изборника Систем → Поставке."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Потврдите мобилну широкопојасну везу"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Ништа)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Кључ у „%s“"
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Уверење у „%s“"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Непознато)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Изабери"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Изабери из датотеке…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Изаберите „%s“ уверење"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
-#, c-format
-msgid "%s certificate _password:"
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
 msgstr "_Лозинка „%s“ уверења:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Грешка пријављивања"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Грешка отварања сесије"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Откључај модул"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Издаје га"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Унесите „%s“ ПИН"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Пријави ме"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Запамти ПИН"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Сачувај лозинку само за овог корисника"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Сачувај лозинку за све кориснике"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Увек затражи ову лозинку"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Лозинка није потребна"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Друга лозинка:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Прикажи _лозинке"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Трећа лозинка:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "Прикажи _лозинке"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Друга лозинка:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Лозинка:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Притисните да се повежете"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
-"морати да уредите везу у уређивачу веза"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Ново…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамички ВЕП (802.1х)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Бежична мрежа захтева потврђивање идентитета"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Направи нову бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Нова бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Унесите назив за нову бежичну мрежу."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Повежи се на скривену бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Скривена бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4498,35 +4644,54 @@ msgstr ""
 "Унесите назив и безбедносне податке за скривену бежичну мрежу на коју желите "
 "да се повежете."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Бежична _безбедност:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Веза:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Бежични _уређај:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Не могу да нађем издавача и желим да га унесем _ручно:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Издавач:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Списак држава или региона:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Држава или регион"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Жичана"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "ОЛПЦ мрежица"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "АДСЛ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "ПЦИ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "УСБ"
 
@@ -4536,17 +4701,41 @@ msgstr "УСБ"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
+"морати да уредите везу у уређивачу веза"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Бежична _безбедност:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Име мреже:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Веза:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Бежични _уређај:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Употреба:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4554,7 +4743,7 @@ msgstr ""
 "Овај програм је део Управника мреже (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4562,325 +4751,348 @@ msgstr ""
 "Овај програм није намењен за рад у линији наредби, већ је део Гномовог "
 "радног окружења."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "ЕВДО"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "ГПРС"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "ЕДГЕ"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "УМТС"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "ХСДПА"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "ХСУПА"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "ХСПА"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "ХСПА+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "ЛТЕ"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "није омогућено"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "није регистрован"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Кућна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Кућна мрежа"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "претражујем"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрација је одбијена"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s роминг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Мрежа у ромингу (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Мрежа у ромингу"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "ПИН код за СИМ картицу „%s“ на „%s“"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Потребан је ПИН кôд"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Потребан је ПИН код за повезивање мобилног широкопојасног уређаја"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Повезани сте на мобилну широкопојасну везу „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "пребацивање"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s веза"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "ПЕМ уверења (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "непозната грешка у 802.1X безбедности (впа-еап)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "Није изабрано уверење"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "изабрана датотека уверења не постоји"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "недостаје ЕАП-ФАСТ ПАЦ датотека"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "ГТЦ"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Изабери ПАЦ датотеку"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "ПАЦ датотеке (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Потврђеним идентитетом"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Оба"
 
-#: ../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:3
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Анонимни _идентитет:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "ПАЦ _датотека:"
 
 # ~Милош
-#: ../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:1
-msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Унутрашња пријава:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволи самостално ПАЦ _резервисање"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "недостаје ЕАП-ЛЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "недостаје ЕАП-ЛЕАП лозинка"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "МД5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Издање 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Издање 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Није потребно _уверење"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "ПЕАП _издање:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Суфикс назива уверења сервера."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
-msgid "_Domain:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+#, fuzzy
+msgid "_Domain"
 msgstr "_Домен:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "недостаје ЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "недостаје ЕАП лозинка"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "ВЕП 128-битна лозинка"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Прикажи _лозинке"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "недостаје ЕАП-ТЛС идентитет"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "није изабрано корисничко уверење"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "изабрана датотека корисничког уверења не постоји"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "није изабран кључ"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "изабрана датотека кључа не постоји"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "_Идентитет:"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "МСЦХАПв2 (без ЕАП-а)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Непозната грешка проверавања 802.1X безбедности"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "ТЛС"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "ЛЗНК"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "ФАСТ"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "ТЛС кроз тунел"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Заштићени ЕАП (ПЕАП)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "По_тврђивање идентитета:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "недостаје леап корисничко име"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "недостаје леап лозинка"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "недостаје веп кључ"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само хекса-бројеве"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само аскри знакове"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4889,39 +5101,41 @@ msgstr ""
 "неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине "
 "5/13 (аскри) или 10/26 (хекс)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "неисправан веп-кључ: лозинка не сме бити празна"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "неисправан веп-кључ: лозинка мора бити краћа од 64 знака"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Отворени систем"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Дељени кључ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Основно)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Кључ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "П_рикажи кључ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "ВЕП _индекс:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4930,24 +5144,87 @@ msgstr ""
 "неисправна впа лозинка: неисправна дужина кључа %zu. Мора бити [8,63] бајта "
 "или 64 хекса-броја"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "неисправна впа лозинка: не могу да растумачим кључ од 64 бајта као "
 "хексадецимални"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Врста:"
 
-#~ msgid "DSL"
-#~ msgstr "ДСЛ"
+#~ msgid "%s (default)"
+#~ msgstr "%s (основно)"
+
+#~ msgid "Ignored"
+#~ msgstr "Занемарено"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Не могу да ажурурам лозинке везе због непознате грешке."
 
-#~ msgid "Mode"
-#~ msgstr "Режим"
+#~ msgid "Priority:"
+#~ msgstr "Важност:"
 
-#~ msgid "MTU"
-#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Сам се повежи на ову мрежу када је доступна"
+
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Приоритет везе за самостално активирање:"
+
+#~ msgid "Mode:"
+#~ msgstr "Режим:"
+
+#~ msgid "MTU:"
+#~ msgstr "МТУ:"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Не могу да увезем ВПН везу"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Не могу да прочитам датотеку „%s“ или она не садржи познате ВПН податке о "
+#~ "вези\n"
+#~ "\n"
+#~ "Грешка: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "непозната грешка"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Активне везе мреже"
+
+#~ msgid "DSL"
+#~ msgstr "ДСЛ"
 
 #~ msgid "no file selected"
 #~ msgstr "није изабрана датотека"
@@ -5053,30 +5330,6 @@ msgstr "_Врста:"
 #~ 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"
 
@@ -5158,12 +5411,6 @@ msgstr "_Врста:"
 #~ msgid "BSID:"
 #~ msgstr "БСИД:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Секундарни ДНС:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Терцијарни ДНС:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_МАК адреса уређаја:"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index e7b0440d..85694f84 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -10,61 +10,70 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2018-02-09 08:40+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-02-24 19:43+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: srpski <gnome-sr@googlegroups.org>\n"
-"Language: sr\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3191
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Mreža"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Upravljajte vašim vezama mreže"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Veze sa mrežom"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Sirovo podešavanje"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Upravljajte i izmenite podešavanja vaših mrežnih veza"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Isključivanje obaveštenja o povezivanju"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Uključite ovu opciju da isključite obaveštenja kada se povezujete na mrežu."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Isključivanje obaveštenja o prekidu veze"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Uključite ovu opciju da isključite obaveštenja kada prekidate vezu sa mrežom."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Isključivanje VPN obaveštenja"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -72,80 +81,82 @@ msgstr ""
 "Uključite ovu opciju da isključite obaveštenja kada se povezujete na VPN ili "
 "kada prekidate vezu sa njim."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Isključi obaveštavanja o dostupnim mrežama"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Uključite ovu opciju da isključite obaveštenja o dostupnosti bežičnih mreža."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Pečat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Ovo određuje da li treba prevesti podešavanja na novo izdanje."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Onemogući obrazovanje bežične mreže"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"Uključite ovu opciju da isključite obrazovanje adhok mreža iz Upravnika mrežama."
+"Uključite ovu opciju da isključite obrazovanje adhok mreža iz Upravnika "
+"mrežama."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Prikazuje programče u oblasti obaveštenja"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Poništite izbor da isključite prikazivanje programčeta u oblasti obaveštenja."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Zanemaruje CA uverenje"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"Uključite ovu opciju da isključite upozorenja o CA uverenjima u EAP potvrđivanju "
-"identiteta."
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u EAP "
+"potvrđivanju identiteta."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"Uključite ovu opciju da isključite upozorenja o CA uverenjima u drugoj fazi EAP "
-"potvrđivanja identiteta."
+"Uključite ovu opciju da isključite upozorenja o CA uverenjima u drugoj fazi "
+"EAP potvrđivanja identiteta."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Upravnik mreže"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Uređivač veza upravnika mreže"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
-"Upravnik mreže je sistemska usluga za upravljanje i podešavanje mrežnih veza i "
-"uređaja."
+"Upravnik mreže je sistemska usluga za upravljanje i podešavanje mrežnih veza "
+"i uređaja."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -153,37 +164,37 @@ msgstr ""
 "Program um-uređivač-veza radi sa Upravnikom mreže da bi napravio i uredio "
 "postojeće profile veze za Upravnika mreže."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Programeri upravnika mreže"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "klasa objekta „%s“ nema svojstvo sa nazivom „%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "svojstvo „%s“ klase objekta „%s“ nije upisivo"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "svojstvo tvorbe „%s“ za objekat „%s“ se ne može postaviti nakon tvorbe"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "„%s::%s“ nije ispravan naziv svojstva; „%s“ nije podvrsta Gobjekta"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "ne mogu da postavim svojstvo „%s“ vrste „%s“ iz vrednosti vrste „%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -192,81 +203,81 @@ msgstr ""
 "vrednost „%s“ vrste „%s“ nije ispravna ili je van opsega za svojstvo „%s“ "
 "vrste „%s“"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Potvrđivanje identiteta za 802.1X vezu"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:308
-#: ../src/connection-editor/connection-helpers.c:771
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:543
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.c:209
-#: ../src/libnma/nma-wifi-dialog.c:1066
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1072
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Poveži"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Ime mreže:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hok"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "obezbedi."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Nisam uspeo da dodam/aktiviram vezu"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Neuspelo povezivanje"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Neuspelo prekidanje veze uređaja"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Neuspelo prekidanje veze"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Neuspelo aktiviranje veze"
 
-#: ../src/applet.c:809 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/applet.c:899
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +287,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:901
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -286,16 +297,17 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:903
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 "\n"
-"Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN servisa."
+"Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN "
+"servisa."
 
-#: ../src/applet.c:905
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +318,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ jer je VPN servis poslao neodgovarajuća "
 "podešavanja."
 
-#: ../src/applet.c:907
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +327,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer je isteklo vreme za povezivanje."
 
-#: ../src/applet.c:909
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +336,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer VPN servis nije pokrenut na vreme."
 
-#: ../src/applet.c:911
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +345,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zato što ne mogu da pokrenem VPN servis."
 
-#: ../src/applet.c:913
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -342,7 +354,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer ne postoje ispravne VPN lozinke."
 
-#: ../src/applet.c:915
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +363,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neispravnih VPN lozinki."
 
-#: ../src/applet.c:920
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -360,7 +372,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“."
 
-#: ../src/applet.c:947
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -371,19 +383,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:949
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN veza je uspešno uspostavljena.\n"
 
-#: ../src/applet.c:951
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Poruka za VPN prijavu"
 
-#: ../src/applet.c:959 ../src/applet.c:999
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Nije uspelo povezivanje na VPN"
 
-#: ../src/applet.c:1003
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -397,7 +409,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1006
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -410,325 +422,323 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1295
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "uređaj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1297
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "uređaj nije spreman"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1307 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet.c:1323
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1337
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ne mogu da upravljam uređajem"
 
-#: ../src/applet.c:1410
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Nije pronađen nijedan mrežni uređaj"
 
-#: ../src/applet.c:1464
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN veze"
 
-#: ../src/applet.c:1508
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "Po_desi VPN…"
 
-#: ../src/applet.c:1511
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Dodaj VPN vezu…"
 
-#: ../src/applet.c:1617
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Upravljač mrežom nije pokrenut…"
 
-#: ../src/applet.c:1622 ../src/applet.c:2687
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Umrežavanje isključeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1832
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Uključi _mrežne usluge"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1841
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Uključi _bežično mreženje"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1850
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilne veze"
 
 #. Toggle notifications item
-#: ../src/applet.c:1862
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Prikaži obaveštenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1874
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1882
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Uredi veze…"
 
-#: ../src/applet.c:1896
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2207
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Povezani ste na „%s“."
 
-#: ../src/applet.c:2247
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2550
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Pripremam mrežnu vezu „%s“…"
 
-#: ../src/applet.c:2553
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Potrebna je prijava korisnika za uspostavljanje veze „%s“…"
 
-#: ../src/applet.c:2556 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Zahtevam mrežnu adresu za „%s“…"
 
-#: ../src/applet.c:2559
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Povezani ste preko veze „%s“"
 
-#: ../src/applet.c:2632
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Uspostavljam VPN vezu „%s“…"
 
-#: ../src/applet.c:2635
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Potrebna je prijava korisnika za uspostavljanje VPN veze „%s“…"
 
-#: ../src/applet.c:2638
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Zahtevam VPN mrežnu adresu za „%s“…"
 
-#: ../src/applet.c:2641
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "Povezani ste preko VPN veze"
 
-#: ../src/applet.c:2691
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Nema mrežne veze"
 
-#: ../src/applet.c:3292
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Programče upravnika mreže"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Pogrešan PUK kod, kontaktirajte vašeg provajdera."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Pogrešan PIN kod, kontaktirajte vašeg provajdera."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Šaljem kod za otključavanje…"
 
-#: ../src/applet-device-broadband.c:737 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna veza (%s)"
 
-#: ../src/applet-device-broadband.c:739
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:308
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilna"
 
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dostupno"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:805
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Nova mobilna, širokopojasna veza…"
 
-#: ../src/applet-device-broadband.c:819 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Veza uspostavljena"
 
-#: ../src/applet-device-broadband.c:820
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Povezani ste mobilnom širokopojasnom mrežom."
 
-#: ../src/applet-device-broadband.c:960 ../src/applet-device-broadband.c:966
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilna širokopojasna mreža."
 
-#: ../src/applet-device-broadband.c:961
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Sada ste registrovani na kućnu mrežu."
 
-#: ../src/applet-device-broadband.c:967
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Sada ste registrovani na mrežu prebacivanja."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Povezani ste mobilnom širokopojasnom mrežom."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Pripremam mobilnu, širokopojasnu vezu „%s“…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Podešavam mobilnu, širokopojasnu vezu „%s“…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Potrebna je prijava korisnika za povezivanje u mobilnoj mreži „%s“…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Povezani ste preko mobilne širokopojasne veze „%s“"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatska žičana veza"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Žičane mreže (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Žičane mreže"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Žičana mreža"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Povezani ste na žičanu mrežu."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Pripremam vezu preko žičane mrežu „%s“…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Podešavam vezu preko žičane mrežu „%s“…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Potrebna je prijava korisnika za uspostavljanje žičane veze „%s“…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Zahtevam adresu za žičanu mrežu „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Povezani ste preko žičane veze „%s“"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Potvrđivanje identiteta DSL-a"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:311
-#: ../src/connection-editor/page-mobile.c:545
-#: ../src/libnma/nma-vpn-password-dialog.c:210
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "U _redu"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Poveži se na skrivenu bežičnu mrežu…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Napravi _novu bežičnu mrežu…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Nisam uspeo da dodam novu vezu"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Nedovoljna ovlašćenja."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bežične mreže (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bežična mreža (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Bežična mreža"
@@ -736,238 +746,252 @@ msgstr[1] "Bežične mreže"
 msgstr[2] "Bežične mreže"
 msgstr[3] "Bežična mreža"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Bežična mreža je isključena"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Bežična mreža je isključena fizičkim prekidačem"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Još mreža"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupne su bežične mreže"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Koristite izbornik mreže da se povežete na bežičnu mrežu"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Povezani ste na bežičnu mrežu „%s“."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Pripremam bežičnu mrežnu vezu „%s“…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Podešavam vezu preko bežične mreže „%s“…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Potrebna je prijava korisnika za uspostavljanje bežične veze „%s“…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Zahtevam adresu bežične mreže za „%s“…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Povezani ste preko bežične veze „%s“ : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Povezani ste preko bežične veze „%s“"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Nisam uspeo da aktiviram vezu"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:381
-#: ../src/libnma/nma-wifi-dialog.c:949 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dinamički VEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "VPA/VPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Još adresa"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "VEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:332
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (osnovno)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Adresa za emitovanje"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mrežna maska"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primarni:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Sekundarni DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Tercijarni DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 bežična (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Uređaj"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hardverska adresa"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drajver"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Brzina"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Bezbednost:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Podrazumevana ruta"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Zanemareno"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Vruća tačka"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN vrsta"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN mrežni prolaz"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN korisničko ime"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN baner"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Veza osnove"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Nema ispravnih, pokrenutih veza!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -977,16 +1001,16 @@ msgstr ""
 "Autorska prava © 2005-2008 Novel, Doo.\n"
 "i mnogi drugi saradnici zajednice i prevodioci"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Programče obaveštajne zone za upravljanje mrežnim uređajima i vezama."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Veb stranica Upravnika mrežom"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Filip Miletić\n"
@@ -997,7 +1021,7 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1005,33 +1029,33 @@ msgstr ""
 "Programče Upravnik mreže ne može da pronađe neke potrebne resurse („.ui“ "
 "datoteka nije pronađena)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Nedostaju resursi"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otključati SIM PIN"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Potrebno je otključati SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1039,25 +1063,25 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN kôd:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Prikaži PIN kôd"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otključati SIM PUK"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Potrebno je otključati SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,43 +1089,42 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PUK kôd."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK kôd:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Novi PIN kôd:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite PIN kôd:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kôdove"
 
-#: ../src/applet-vpn-request.c:201
-#| msgid "Connection cannot be deleted"
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Veza nema VPN podešavanje"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
-#| msgid "Failed to create DUN connection: %s"
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Nisam uspeo da zapišem vezu na VPN korisničko sučelje: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
-msgstr "Nisam uspeo da zapišem vezu na VPN korisničko sučelje: nepotpuno pisanje"
+msgstr ""
+"Nisam uspeo da zapišem vezu na VPN korisničko sučelje: nepotpuno pisanje"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1109,56 +1132,57 @@ msgstr ""
 "IP adrese za prepoznavanje vašeg računara unutar mreže. Kliknite na dugme "
 "„Dodaj“ za unos IP adrese."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:772
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Zanemari automatski dobijene rute"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Koristi ovu vezu samo za izvore na sopstvenoj mreži"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"Ukoliko je uključeno, ova veza nikada neće biti u korišćena kao podrazumevana."
+"Ukoliko je uključeno, ova veza nikada neće biti u korišćena kao "
+"podrazumevana."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "_Napravi…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Izaberite vrstu veze"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1170,84 +1194,100 @@ msgstr ""
 "Ako pravite VPN vezu, a ista se ne pojavljuje na spisku, možda nemate "
 "instaliran ispravan VPN priključak."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Uređaj:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Kružno menjanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Radna rezerva"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "IksOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Emitovanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Prilagodljivo uravnoteženje učitavanja prenosa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Prilagodljivo uravnoteženje učitavanja"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (preporučeno)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Privezane _veze:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Režim:"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "Učestalost _praćenja:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Uređaj:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "_Praćenje veze:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP _mete:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1255,105 +1295,119 @@ msgstr ""
 "IP adresa, ili spisak zarezom razdvojenih IP adresa, koje će biti potražene "
 "prilikom provere stanja veze."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Zastoj _povezivanja:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Zastoj _razvezivanja:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Primarni:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 msgstr ""
-"Naziv sučelja primarnog uređaja. Ako je postavljeno, ovaj uređaj će uvek biti "
-"aktivan sporedni kada je dostupan."
-
-#: ../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: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:"
+"Naziv sučelja primarnog uređaja. Ako je postavljeno, ovaj uređaj će uvek "
+"biti aktivan sporedni kada je dostupan."
+
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "bajta"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Trošak _putanje:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Važnost:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Režim ukosnice:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Premošćene _veze:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "Zastoj _prosleđivanja:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Vreme pozdrava:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Zastoj STP prosleđivanja, u sekundama"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Vreme STP pozdrava, u sekundama"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Uključi I_GMP njuškanje"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr ""
 "Kontroliše da li je IGMP njuškanje uključeno za ovaj most. Znajte da ako je "
-"njuškanje automatski isključeno zbog sukoba heša, sistem može odbiti da uključi "
-"ovu funkciju sve dok se sukobi ne reše."
+"njuškanje automatski isključeno zbog sukoba heša, sistem može odbiti da "
+"uključi ovu funkciju sve dok se sukobi ne reše."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Uključi _STP (Protokol obuhvatnog drveta)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
-msgstr "Kontroliše da li je Protokol stabla raširenja (STP) uključen za ovaj most"
+msgstr ""
+"Kontroliše da li je Protokol stabla raširenja (STP) uključen za ovaj most"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1361,27 +1415,30 @@ msgstr ""
 "STP prioritet za ovaj most. Niže vrednosti su „bolje“; most sa nižim "
 "prioritetom biće izabran za koreni most."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "_Najveće vreme:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Najveće trajanje STP poruke, u sekundama"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Vreme _starenja:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Vreme trajanja Eternet MAK adrese, u sekundama"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
-msgid "Group _forward mask:"
+#: src/connection-editor/ce-page-bridge.ui:490
+#, fuzzy
+msgid "Group _forward mask"
 msgstr "Grupiši masku za _napred:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1392,40 +1449,40 @@ msgstr ""
 "do 01:80:C2:00:00:0F koja mora biti prosleđena. Maska ne može imati podešene "
 "bitove 0, 1 ili 2 jer se koriste za kadrove STP, MAK pauze i LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatski"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "osnovno"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "nepoznata greška"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Očuvaj"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Trajno"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Nasumično"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabilno"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1434,188 +1491,228 @@ msgstr ""
 "Uneta MAK adresa se koristi kao adresa mrežnog uređaja. Ova mogućnost se "
 "naziva MAK kloniranje ili spufing. Primer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "HV adresa"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "neispravno %s za %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "neispravno %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "neispravan naziv sučelja za %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "neispravan naziv sučelja (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "ne mogu da obradim naziv uređaja"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "neispravna hardverska adresa"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "neispravno „%s“ (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "uređaj"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "neispravno „%s“ (%s) "
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Ne mogu da ažururam lozinke veze zbog nepoznate greške."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Koristi premošćavanje centra podataka (DCB) za ovu vezu"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Kontrola toka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funkcija"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Uključi"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Obavesti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Pripravan"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Važnost"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Opcije…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Grupe važnosti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Sastav"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Kontrola toka važnosti"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Uključite ili isključite važnost pauze prenosa za svaku korisničku važnost."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Važnost:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Razred saobraćaja:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "Izričita pojasna širina:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Pojasna širina važnosti:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Pojasna širina grupe:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "IB grupe:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Upišite IB grupe važnosti za svaku korisničku važnost."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1623,35 +1720,36 @@ msgstr ""
 "Upišite dozvoljeni procenat pojasne širine veze koji svaka grupa važnosti "
 "može da koristi. Zbir svih grupa mora biti 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Upišite procenat pojasne širine grupe važnosti koji svaka korisnička važnost "
 "može da koristi."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Uključite ili isključite izričitu pojasnu širinu za svaku korisničku važnost."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Upišite razred saobraćaja za svaku korisničku važnost."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Korisničko ime:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Korisničko ime korišćeno za potvrđivanje identiteta sa PPPoE uslugom."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1659,180 +1757,191 @@ msgstr ""
 "Pokreće samo sesije sa koncentratorima pristupa koji pružaju određenu "
 "uslugu. Za većinu provajdera to treba ostaviti prazno."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "S_ervis:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Prikaži _lozinku"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Lozinka korišćena za potvrđivanje identiteta sa PPPoE uslugom."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Lozinka:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
-#| msgid "_Parent interface:"
-msgid "PPP _interface:"
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
 msgstr "PPP _uređaj:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
-#| msgid "_Parent interface:"
-msgid "P_arent interface:"
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
 msgstr "_Roditeljski uređaj:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "Proizvoljno ime za dodeljivanje novostvorenom PPP sučelju."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Sučelje na kome će biti uspostavljena PPP veza."
 
-#: ../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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Roditeljski uređaj:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Samostalno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Upleteni par (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Sučelje jedinice prikačinjanja (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Sučelje nezavisnog medija (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 MB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 MB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 GB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 GB/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Pola"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Potpuno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:155
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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:191
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Ručno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Port:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device:"
-msgstr "_Uređaj:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+#, fuzzy
+msgid "C_loned MAC address"
 msgstr "_Klonirana MAK adresa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
 msgstr "Probudi na LAN-u:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "_Osnovno"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Zanemari"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Fizički"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "Za _jednu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Za _više"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "Za _sve"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_PRA"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "_Magično"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+#, fuzzy
+msgid "_Wake on LAN password"
 msgstr "_Probudi sa LAN lozinkom:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "Probudi-sa-LAN lozinkom (žičani MAK). Važi samo za magične pakete."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+#, fuzzy
+msgid "Lin_k negotiation"
 msgstr "Pregovor _veze:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1842,11 +1951,12 @@ msgstr ""
 "„Dupleks“ biće primorani bez provere pogodnosti uređaja. Ako niste sigurni, "
 "ostavite ovde „Zanemari“ ili izaberite „Samostalno“."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
-msgid "_Speed:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Brzina:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1856,11 +1966,12 @@ msgstr ""
 "opcije „Zanemari“ i „Samostalno“. Pre nego što navedete vrednost brzine "
 "budite sigurni da je vaš uređaj podržava."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
-msgid "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+#, fuzzy
+msgid "Duple_x"
 msgstr "_Dupleks:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1870,36 +1981,58 @@ msgstr ""
 "izabrane opcije „Zanemari“ i „Samostalno“. Pre nego što navedete režim "
 "dupleksa budite sigurni da je vaš uređaj podržava."
 
-#: ../src/connection-editor/ce-page-general.ui.h:1
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "Sam se poveži na _VPN kada koristiš ovu vezu"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Ništa"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Svi _korisnici mogu da se povežu na ovu mrežu"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Sam se poveži na ovu mrežu kada je dostupna"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Sam se poveži na _VPN kada koristiš ovu vezu"
+
+#: src/connection-editor/ce-page-general.ui:96
+#, fuzzy
+msgid "Firewall _zone"
+msgstr "Oblast _mrežne barijere:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Timske veze:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
-msgstr "_Prioritet veze za samostalno aktiviranje:"
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Zanemari automatski dobijene rute"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
 "Default value is 0."
 msgstr ""
-"Prioritet veze za samostalno aktiviranje. Veze sa većim brojem imaju prednost "
-"prilikom izbora profila za samostalno aktiviranje. Osnovna vrednost je 0."
-
-#: ../src/connection-editor/ce-page-general.ui.h:6
-msgid "Firewall _zone:"
-msgstr "Oblast _mrežne barijere:"
+"Prioritet veze za samostalno aktiviranje. Veze sa većim brojem imaju "
+"prednost prilikom izbora profila za samostalno aktiviranje. Osnovna vrednost "
+"je 0."
 
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1908,7 +2041,7 @@ msgstr ""
 "„Dodaj“ da dodate statičku IP adresu kako bi bila podešena kao dodatak "
 "samostalnoj."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1919,126 +2052,133 @@ msgstr ""
 "koja se dodeljuje drugim računarima. Kliknite na dugme „Dodaj“ da dodate IP "
 "adresu. Ako nije data nijedna adresa, opseg se određuje samostalno."
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Dodatne statičke adrese"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adresa (izborno)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-msgid "_Transport mode:"
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
 msgstr "Režim _prenosa:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
-msgid "Device name:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
+#, fuzzy
+msgid "Device name"
 msgstr "Naziv uređaja:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
-msgid "Parent device:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
+#, fuzzy
+msgid "Parent device"
 msgstr "Roditeljski uređaj:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
-msgid "Mode:"
-msgstr "Režim:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
+msgid "Mode"
+msgstr "Režim"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
-msgid "Local IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
+#, fuzzy
+msgid "Local IP"
 msgstr "Mesni IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
-msgid "Remote IP:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
+#, fuzzy
+msgid "Remote IP"
 msgstr "Udaljeni IP:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
-msgid "Input key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
+#, fuzzy
+msgid "Input key"
 msgstr "Ulazni ključ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
-msgid "Output key:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
+#, fuzzy
+msgid "Output key"
 msgstr "Izlazni ključ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
-msgid "MTU:"
-msgstr "MTU:"
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
+msgid "MTU"
+msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatski sa ručnim DNS podešavanjem"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Veži-lokalno"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:211
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Podeljeno sa ostalim računarima"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Metod:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2048,8 +2188,8 @@ msgstr ""
 "podešavanja vašeg računara. Ukoliko želite da koristite ovu mogućnost, "
 "unesite naziv DHCP programa."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2057,25 +2197,26 @@ msgstr ""
 "Domeni za razrešenje naziva domaćina. Koristite tačke da razdvojite više "
 "domena."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "_IB DHCP klijenta:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:372
-#: ../src/connection-editor/page-ip6.c:346
-msgid "S_earch domains:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Domeni _pretrage:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:363
-#: ../src/connection-editor/page-ip6.c:337
-msgid "DNS ser_vers:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS serveri:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2083,47 +2224,46 @@ msgstr ""
 "IP adrese servera domena za razrešenje naziva domaćina. Koristite tačke da "
 "razdvojite više adresa."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Zahteva IPv_4 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
-"ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
+"Pri povezivanju na IPv6 kablovske mreže dozvoljava uspostavljanje veze "
+"ukoliko ne rade IPv4 podešavanja, a rade IPv6 podešavanja."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rute…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Isključeno"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Uključeno (prvenstvo javnoj adresi)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Uključeno (prvenstvo privremenoj adresi)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#| msgid "Stable"
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Stabilna privatnost"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2133,275 +2273,293 @@ msgstr ""
 "razdvojite više adresa servera domena. Adrese mesne veze biće samostalno "
 "ubačena u opseg uređaja za povezivanje."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Proširenja IPv6 _privatnosti:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
-msgid "IPv6 address _generation mode:"
+#: src/connection-editor/ce-page-ip6.ui:319
+#, fuzzy
+msgid "IPv6 address _generation mode"
 msgstr "Režim _stvaranja IPv6 adrese:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Zahteva IPv_6 adresiranje za uspostavljanje veze"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze ukoliko "
-"ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
+"Pri povezivanju na IPv4 kablovske mreže dozvoljava uspostavljanje veze "
+"ukoliko ne rade IPv6 podešavanja, a rade IPv4 podešavanja."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Proveri"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Izričito"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Naziv „MACsec“ uređaja."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr ""
-"Naziv roditeljskog sučelja ili UUID roditeljske veze sa kojih ovo MAKSEC sučelje "
-"treba da se napravi."
+"Naziv roditeljskog sučelja ili UUID roditeljske veze sa kojih ovo MAKSEC "
+"sučelje treba da se napravi."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr ""
-"Naziv roditeljskog sučelja ili UUID roditeljske veze sa kojih ovo MAKsec sučelje "
-"treba da se napravi"
+"Naziv roditeljskog sučelja ili UUID roditeljske veze sa kojih ovo MAKsec "
+"sučelje treba da se napravi"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Pred-deljeni naziv ključa pridruživanja povezivosti"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Pred-deljeni ključ pridruživanja povezivosti"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
 "security page"
 msgstr ""
 "Navodi kako se dobija CAK (ključ pridruživanja povezivosti) za MKA (MAKsec "
-"saglasnost ključa). Za EAP režim, popunite parametre na bezbednosnoj stranici "
-"802.1X"
+"saglasnost ključa). Za EAP režim, popunite parametre na bezbednosnoj "
+"stranici 802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
-msgid "CKN:"
+#: src/connection-editor/ce-page-macsec.ui:154
+#, fuzzy
+msgid "CKN"
 msgstr "CKN:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
-msgid "CAK:"
+#: src/connection-editor/ce-page-macsec.ui:167
+#, fuzzy
+msgid "CAK"
 msgstr "CAK:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
-msgid "Keys:"
+#: src/connection-editor/ce-page-macsec.ui:191
+#, fuzzy
+msgid "Keys"
 msgstr "Tasteri:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
-msgid "Parameters:"
+#: src/connection-editor/ce-page-macsec.ui:207
+#, fuzzy
+msgid "Parameters"
 msgstr "Parametri:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
-msgid "Validation:"
+#: src/connection-editor/ce-page-macsec.ui:224
+#, fuzzy
+msgid "Validation"
 msgstr "Potvrđivanje:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
-msgid "SCI port:"
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
 msgstr "SCI port:"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Navodi režim potvrđivanja za dolazne kadrove"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Da li preneseni saobraćaj mora biti šifrovan"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Sastojak porta za SCI (bezbedni odrednik kanala)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Osnovno"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Broj:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_IB mreže:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Izmeni…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "_PIN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Dozvoli _roming ukoliko nema domaće mreže"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Prikaži _lozinke"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Dozvoljeni načini:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Podesi _načine…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Sažimanje"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Koristi šifrovanje „tačka-do-tačke“ (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Zahteva 128-bitno šifrovanje"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Koristi _rečit MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Dozvoli _BSD pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Dozvoli _Deflejt pakovanje podataka"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Koristi _pakovanje TCP zaglavlja"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eho"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Šalji PPP _eho pakete"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Samo za preglednika"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 "Koristite ovo podešavanje posrednika za samo za klijente/šeme preglednika."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+#, fuzzy
+msgid "PAC URL"
 msgstr "PAC adresa:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:64
+#, fuzzy
+msgid "PAC script"
 msgstr "PAC skripta:"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "Adresa sa koje će se uzeti PAC skripta."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Uvezi skriptu iz datoteke…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
-msgid "Method:"
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
 msgstr "Metod:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "_Napredno…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Podesi glavnim"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Stanje žičanog porta"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Napredne opcije tima"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+#, fuzzy
+msgid "_Queue ID"
 msgstr "_IB reda:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2409,20 +2567,21 @@ msgstr ""
 "Broj izliva neželjenih NAs i besplatnih ARP paketa koji se šalju nakon "
 "uključivanja ili isključivanja porta."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "IB reda na koji ovaj port treba biti mapiran."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Opcije pokretača aktivne rezerve"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "_Port priority:"
+#: src/connection-editor/ce-page-team-port.ui:271
+#, fuzzy
+msgid "_Port priority"
 msgstr "_Hitnost porta:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2430,37 +2589,34 @@ msgstr ""
 "Vrednost je pozitivan broj u milisekundama. Navodi interval između izliva "
 "paketa obaveštenja o parnjaku."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Važnost porta. Veći broj znači veću hitnost."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "_Lepljiv port"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
-#: ../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."
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
-"Proverava primljene ARP pakete na aktivnim portovima. Ako ovo nije izabrano, "
-"svi dolazeći ARP paketi će se smatrati dobrim odgovorom."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Opcije LACP pokretača"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+#, fuzzy
+msgid "_LACP port priority"
 msgstr "_Hitnost LACP porta:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+#, fuzzy
+msgid "LACP port _key"
 msgstr "Ključ LACP _porta:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2468,15 +2624,15 @@ msgstr ""
 "Broj izliva zahteva za pridruživanje multikast grupi nakon uključivanja ili "
 "isključivanja porta."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 "Hitnost porta u skladu sa LACP standardom. Manji broj znači veću hitnost."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2484,7 +2640,7 @@ msgstr ""
 "Vrednost je pozitivan broj u milisekundama. Navodi interval između izliva "
 "zahteva za pridruživanje multikast grupi."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2492,48 +2648,56 @@ msgstr ""
 "Ključ porta prema LACP standardu. Moguće je sjediniti portove samo sa istim "
 "ključem."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
-msgid "_Link watcher:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+#, fuzzy
+msgid "_Link watcher"
 msgstr "Posmatrač _veze:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+#, fuzzy
+msgid "_Up delay"
 msgstr "Zastoj _slanja:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+#, fuzzy
+msgid "_Down delay"
 msgstr "Zastoj _primanja:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+#, fuzzy
+msgid "Send _interval"
 msgstr "_Interval slanja:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+#, fuzzy
+msgid "Delay _before first send"
 msgstr "Zastoj _pre prvog slanja:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
-msgid "_Maximum missed replies:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+#, fuzzy
+msgid "_Maximum missed replies"
 msgstr "_Najviše propuštenih odgovora:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
-msgid "_Source host:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
 msgstr "Domaćin _izvora:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+#, fuzzy
+msgid "_Target host"
 msgstr "Domaćin _cilja:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
@@ -2541,8 +2705,8 @@ msgstr ""
 "Najveći broj propuštenih odgovora. Ako se prevaziđe ovaj broj, veza se "
 "označava palom."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2550,8 +2714,8 @@ msgstr ""
 "Naziv domaćina koji će biti pretvoren u IP adresu koja će biti popunjena u "
 "ARP zahtevu kao adresa izvora."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2559,18 +2723,27 @@ msgstr ""
 "Naziv domaćina koji će biti pretvoren u IP adresu koja će biti popunjena u "
 "zahtevu kao adresa odredišta."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Zanemari neispravne pakete sa _aktivnih portova"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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 ""
+"Proverava primljene ARP pakete na aktivnim portovima. Ako ovo nije izabrano, "
+"svi dolazeći ARP paketi će se smatrati dobrim odgovorom."
+
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Zanemari neispravne pakete sa _neaktivnih portova"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2578,13 +2751,13 @@ msgstr ""
 "Proverava primljene ARP pakete na neaktivnim portovima. Ako ovo nije "
 "izabrano, svi dolazeći ARP paketi će se smatrati dobrim odgovorom."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "_Pošalji na neaktivnim portovima"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2592,157 +2765,163 @@ msgstr ""
 "Po osnovi, ARP zahtevi se šalju samo na aktivnim portovima. Ova opcija "
 "omogućava slanje čak i na neaktivnim portovima."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr "Zastoj između uspostavljanja veze i obaveštavanja pokretača o tome."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "Zastoj između padanja veze i obaveštavanja pokretača o tome."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Interval između slanja zahteva."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "Zastoj između pokretanja praćenja veze i slanja prvog zahteva."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Osmatrač veze koji će se koristiti."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Osmatrač veze"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "Uvezi timsko _podešavanje iz datoteke…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
 msgstr "Uredi _JSON podešavanje:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Sirovo podešavanje"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Najveća hitnost"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Najveća hitnost (stabilno)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Pojasna širina"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Najveći broj portova"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Hitnost porta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Sa timskog uređaja"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Sa aktivnog porta"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Sa aktivnog na timski uređaj"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Timske veze:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Ravnoteža učitavanja"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Žičana veza"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "Neki L3 protokol"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "Neki L4 protokol"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+#, fuzzy
+msgid "_Peer notification count"
 msgstr "Broj obaveštenja _parnjaka:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+#, fuzzy
+msgid "Peer _notification interval"
 msgstr "Interval _obaveštenja parnjaka:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+#, fuzzy
+msgid "_Multicast rejoin count"
 msgstr "_Broj multikast pridruživanja:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+#, fuzzy
+msgid "Multicast _rejoin interval"
 msgstr "_Interval multikast pridruživanja:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+#, fuzzy
+msgid "_Hardware Address"
 msgstr "_Hardverska adresa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
@@ -2750,31 +2929,33 @@ msgstr ""
 "Željena hardverska adresa novog timskog uređaja. Uobičajeni zapis MAK adrese "
 "je prihvatljiv."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
-msgid "_Runner:"
+#: src/connection-editor/ce-page-team.ui:798
+#, fuzzy
+msgid "_Runner"
 msgstr "_Pokretač:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+#, fuzzy
+msgid "_Hardware address policy"
 msgstr "Politika _hardverske adrese:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Naziv pokretača za korišćenje."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
 msgstr ""
-"Ovo određuje politiku načina podešavanja hardverskih adresa timskog uređaja i "
-"uređaja porta za vreme trajanja tima."
+"Ovo određuje politiku načina podešavanja hardverskih adresa timskog uređaja "
+"i uređaja porta za vreme trajanja tima."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "LACPDU kadrove pošalji _povremeno"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2782,11 +2963,11 @@ msgstr ""
 "Ako je izabrano, LACPDU kadrovi se šalju povremeno sa podešenim vezama. Ako "
 "nije, deluje kao „govori kada ti se obrate“."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "LACPDU kadar pošalji _svake sekunde"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2796,23 +2977,26 @@ msgstr ""
 "LACPDU paketa. Ako je izabrano, paketi će biti poslati jedan u sekundi. U "
 "suprotnom će biti poslati na svakih 30 sekundi."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
-msgid "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+#, fuzzy
+msgid "_System priority"
 msgstr "Hitnost _sistema:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+#, fuzzy
+msgid "_Minimum ports"
 msgstr "_Najmanje portova:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+#, fuzzy
+msgid "_Aggregator selection policy"
 msgstr "Politika izbora _sakupljača:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Hitnost sistema, može biti od 0–65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2820,11 +3004,11 @@ msgstr ""
 "Određuje najmanji broj portova koji moraju biti aktivni pre potvrđivanja "
 "nosača u glavnom sučelju, vrednost može biti od 1—255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Ovo bira politiku načina izbora sakupljača."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2832,440 +3016,435 @@ msgstr ""
 "Spisak vrsta odlomaka (niski) koje bi trebalo da se koriste za proračun heša "
 "Tx paketa."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Polja za heš prenosa"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 "U desetim delovima sekunde. Povremeni interval između ponovnog "
 "uravnotežavanja."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Naziv aktivnog Tx uravnotežavača. Aktivno Tx uravnotežavanje je unapred "
 "isključeno."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
-msgid "Transmission _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+#, fuzzy
+msgid "Transmission _balancing interval"
 msgstr "Interval _uravnotežavanja prenosa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+#, fuzzy
+msgid "_Transmission balancer"
 msgstr "Uravnotežavač _prenosa:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Pokretač"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "_Roditeljski uređaj:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
 msgstr "Naziv _VLAN uređaja:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+#, fuzzy
+msgid "Cloned MAC _address"
 msgstr "_Klonirana MAK adresa:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_IB VLAN-a:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+#, fuzzy
+msgid "Flags"
 msgstr "Zastavice:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Preuredi zaglavlja"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Napusti svezivanja"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Naziv uređaja + broj"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + broj"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "B_ezbednost:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klijent"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Vruća tačka"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hok"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_Jačina prenosa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Protok:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kanal:"
 
 # Valjda se odnosi na opseg, a?
 # ~Miloš
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Opseg:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nema ovlašćenja polkita za obavljanje radnje"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Dozvoljeni načini potvrđivanja identiteta"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Nadogradiv protokol za prijavu"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Protokol za prijavu putem lozinke"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
 # Razlupavam se :)
 # ~Miloš
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol za prijavu izazovnim rukovanjem"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Majkrosoftov protokol za prijavu izazovnim rukovanjem"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Majkrosoftov protokol za prijavu izazovnim rukovanjem, 2. izdanje"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
-"U većini slučajeva, PPP serveri dobavljača će podržati sve načine potvrđivanja "
-"identiteta. Ako veza ne uspe, pokušajte da isključite podršku za neke načine."
+"U većini slučajeva, PPP serveri dobavljača će podržati sve načine "
+"potvrđivanja identiteta. Ako veza ne uspe, pokušajte da isključite podršku "
+"za neke načine."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Bežična"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Blutut"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:201
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Infini band"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Veza"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1031 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:233
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP tunel"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:190
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:398
-#: ../src/connection-editor/page-vpn.c:103
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:207
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Priključak za VPN ne može da uveze VPN veze\n"
-"\n"
-"Greška: nije izabrana vrsta VPN servisa."
-
-#: ../src/connection-editor/connection-helpers.c:219
-msgid "Cannot import VPN connection"
-msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/connection-helpers.c:221
-#, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Ne mogu da pročitam datoteku „%s“ ili ona ne sadrži poznate VPN podatke o "
-"vezi\n"
+"Priključak za VPN ne može da uveze VPN veze\n"
 "\n"
-"Greška: %s."
-
-#: ../src/connection-editor/connection-helpers.c:222
-msgid "unknown error"
-msgstr "nepoznata greška"
+"Greška: nije izabrana vrsta VPN servisa."
 
-#: ../src/connection-editor/connection-helpers.c:305
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/connection-editor/connection-helpers.c:340
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../src/connection-editor/connection-helpers.c:367
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuelno"
 
-#: ../src/connection-editor/connection-helpers.c:516
-#: ../src/connection-editor/connection-helpers.c:518
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Uvezi sačuvna VPN podešavanja…"
 
-#: ../src/connection-editor/connection-helpers.c:548
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Ne mogu da pokrenem prozorče za izmenu veze zbog nepoznate greške."
 
-#: ../src/connection-editor/connection-helpers.c:557
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/connection-helpers.c:720
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/connection-helpers.c:768
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Da li da zaista obrišem vezu %s?"
 
-#: ../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:1118
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN veze"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: ../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:1156
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Mrežni prolaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metrički"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1137
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Uređujem %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:113
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Uređujem neimenovanu vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:133
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Nedostaje naziv veze"
 
-#: ../src/connection-editor/nm-connection-editor.c:349
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Pokretanje uređivača…"
 
-#: ../src/connection-editor/nm-connection-editor.c:356
-#: ../src/connection-editor/nm-connection-list.c:443
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Veza ne može biti izmenjena"
 
-#: ../src/connection-editor/nm-connection-editor.c:371
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Neispravno podešavanje %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:447
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"Program za uređivanje veza ne može da pronađe neke od potrebnih resursa (nije "
-"nađena „.ui“ datoteka)."
+"Program za uređivanje veza ne može da pronađe neke od potrebnih resursa "
+"(nije nađena „.ui“ datoteka)."
 
-#: ../src/connection-editor/nm-connection-editor.c:574
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/connection-editor/nm-connection-editor.c:575
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Sačuvaj sve promene u ovoj vezi."
 
-#: ../src/connection-editor/nm-connection-editor.c:576
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Prijavite se kako bi sačuvali ovu vezu za sve korisnike računara."
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Ne mogu da napravim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:592
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:594
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nepoznata greška stvaranja prozorčeta za uređivanje veza."
 
-#: ../src/connection-editor/nm-connection-editor.c:735
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
 msgstr ""
-"Upozorenje: veza sadrži neka svojstva koja nisu podržana od strane uređivača. "
-"Biće obrisana nakon čuvanja."
+"Upozorenje: veza sadrži neka svojstva koja nisu podržana od strane "
+"uređivača. Biće obrisana nakon čuvanja."
 
-#: ../src/connection-editor/nm-connection-editor.c:755
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Greška u pokretanju uređivača"
 
-#: ../src/connection-editor/nm-connection-editor.c:1153
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Nije uspelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Popravi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3273,23 +3452,24 @@ msgstr ""
 "Bezbednosne oznake mogu sprečiti korišćenje nekih datoteka sa potvrđivanjem "
 "identiteta uverenja."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Naziv _veze:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Izvezi…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Ponovno označavanje datoteke"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Ponovo označi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3297,25 +3477,25 @@ msgstr ""
 "Sledeće datoteke nisu označene za korišćenje sa potvrđivanjem identiteta "
 "uverenja. Da li želite da odradite oznake?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Ponovo označi"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: ../src/connection-editor/nm-connection-list.c:151
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "nikad"
 
-#: ../src/connection-editor/nm-connection-list.c:162
-#: ../src/connection-editor/nm-connection-list.c:173
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "sada"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:180
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3324,7 +3504,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3333,7 +3513,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../src/connection-editor/nm-connection-list.c:196
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3342,7 +3522,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../src/connection-editor/nm-connection-list.c:202
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3351,7 +3531,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../src/connection-editor/nm-connection-list.c:206
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3360,134 +3540,159 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godine"
 
-#: ../src/connection-editor/nm-connection-list.c:445
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Veza ne može biti obrisana"
 
-#: ../src/connection-editor/nm-connection-list.c:448
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Izaberite vezu za uređivanje"
 
-#: ../src/connection-editor/nm-connection-list.c:450
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Izaberite vezu za brisanje"
 
-#: ../src/connection-editor/nm-connection-list.c:785
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:798
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Upotrbljena"
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Uređuje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:837
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Prijavite se kako bi izmenili izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:842
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Briše izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Prijavite se kako bi obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1048
-#: ../src/connection-editor/nm-connection-list.c:1051
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Ne znam kako da napravim „%s“ vezu"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Greška prilikom uređivanja veze"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Greška prilikom stvaranja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:1049
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Veza ne može biti izmenjena"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Nisu instalirani VPN priključci."
 
-#: ../src/connection-editor/nm-connection-list.c:1052
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Ne znam kako da napravim „%s“ vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:1085
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:1086
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Nisam našao vezu koja ima UUID „%s“"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Veze sa mrežom"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Dodajte novu vezu"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Bezbednost 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:118
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Ne mogu da učitam bezbednosno korisničko sučelje za 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:132
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Koristi 802.1_X bezbednost za ovu vezu"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "MAK adresa Blutut uređaja. Primer: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Ne mogu da učitam korisničko sučelje blututa."
 
-#: ../src/connection-editor/page-bluetooth.c:173
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neispravan blutut uređaj (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:256
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Blutut veza „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:306
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Vrsta blututa"
 
-#: ../src/connection-editor/page-bluetooth.c:324
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Izaberite vrstu profila blutut veze."
 
-#: ../src/connection-editor/page-bluetooth.c:329
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "Mreža _ličnog domena"
 
-#: ../src/connection-editor/page-bluetooth.c:334
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "Mreža _dvojne parice"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Ne mogu da učitam korisničko sučelje sveze."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primarni"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Veza sveze %d"
 
-#: ../src/connection-editor/page-bridge.c:236
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Ne mogu da učitam korisničko sučelje mosta."
 
-#: ../src/connection-editor/page-bridge.c:352
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Veza mosta %d"
@@ -3495,37 +3700,36 @@ msgstr "Veza mosta %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Priključnik mosta"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Ne mogu da učitam korisničko sučelje priključnika mosta."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Ne mogu da učitam DCB korisničko sučelje."
 
-#: ../src/connection-editor/page-dsl.c:203
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za DSL."
 
-#: ../src/connection-editor/page-dsl.c:298
-#| msgid "_Parent interface:"
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "nedostaje roditeljski uređaj"
 
-#: ../src/connection-editor/page-dsl.c:343
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza „%d“"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3535,55 +3739,54 @@ msgstr ""
 "nazivom ili trajnom MAK adresom ili sa oba. Npr: „em1“, „3C:97:0E:42:1A:19“, "
 "„em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "zanemareno"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za žičanu mrežu."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Uređaj žičane veze"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "kloniran MAK"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Probudi sa LAN lozinkom"
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Žičana veza %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Podrazumevana"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 "Oblast određuje nivo pouzdanosti veze. Zadata nije uobičajena oblast, njeno "
-"biranje dovodi do korišćenja zadate oblasti podešene u mrežnoj barijeri. Može "
-"se koristiti samo ako je pokrenut demon mrežne barijere (firewalld)."
+"biranje dovodi do korišćenja zadate oblasti podešene u mrežnoj barijeri. "
+"Može se koristiti samo ako je pokrenut demon mrežne barijere (firewalld)."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Ne mogu da učitam opšte korisničko sučelje."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3595,193 +3798,187 @@ msgstr ""
 "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:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Ne mogu da učitam korisničko sučelje Infini banda."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband uređaj"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Infini band veza %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Ne mogu da učitam korisničko sučelje IP tunela."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP tunel veza %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:136
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Samostalno (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Samo samostalne (VPN) adrese"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:139
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Samostalno (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Samo samostalne (PPPoE) adrese"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Samostalno (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Samo samostalne (DHCP) adrese"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Samo veži-lokalno"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:335
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Dodatni _DNS serveri:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:344
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Dodatni domeni _pretrage:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Uređujem IPv4 rute za %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 podešavanja"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Ne mogu da učitam IPv4 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 adresa „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 mrežna maska adrese „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 mrežni prolaz „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS server „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Uređujem IPv6 rute za %s"
 
-#: ../src/connection-editor/page-ip6.c:1208
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 podešavanja"
 
-#: ../src/connection-editor/page-ip6.c:1210
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Ne mogu da učitam IPv6 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip6.c:1302
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 adresa „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip6.c:1310
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 prefiks „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:1319
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 mrežni prolaz „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:1361
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS server „%s“ je neispravan"
 
-#: ../src/connection-editor/page-macsec.c:192
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Ne mogu da učitam MACsec korisničko sučelje."
 
-#: ../src/connection-editor/page-macsec.c:331
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MAKSEC veza %d"
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Umnoži podređene"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Oba podređena „%s“ i „%s“ se primenjuju na uređaj „%s“"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
-"Podređeni „%s“ i „%s“ se primenjuju na različite virtuelne priključnike („%s“ "
-"i „%s“) istog fizičkog uređaja."
+"Podređeni „%s“ i „%s“ se primenjuju na različite virtuelne priključnike "
+"(„%s“ i „%s“) istog fizičkog uređaja."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podređuje %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za mobilnu, širokopojasnu mrežu."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nije podržana ova vrsta mobilne, širokopojasne mreže."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog širokopojasnog izdavača"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3789,84 +3986,84 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaš izdavač mobilnih širokopojasnih "
 "usluga. Ukoliko niste sigurni, pitajte izdavača."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj izdavač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Moj izdavač koristi C_DMA tehnologije (npr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ništa"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Uređujem PPP načine prijave za %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP podešavanja"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da učitam PPP korisničko sučelje."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Posrednik"
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Ne mogu da učitam korisničko sučelje posrednika."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Greška: datoteka ne sadrži ispravno JSON podešavanje"
 
-#: ../src/connection-editor/page-team.c:1034
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Ne mogu da učitam timsko korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:1131
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Timska veza „%d“"
@@ -3874,68 +4071,67 @@ msgstr "Timska veza „%d“"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:655
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Timski priključnik"
 
-#: ../src/connection-editor/page-team-port.c:657
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Ne mogu da učitam korisničko sučelje timskog priključnika."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (putem „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Nova veza…"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Ne mogu da učitam korisničko sučelje vlan-a."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan nadređeni"
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:67
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Ne mogu da učitam VPN priključak uređivača za „%s“ (%s)."
 
-#: ../src/connection-editor/page-vpn.c:68
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "nepoznat neuspeh"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Ne mogu da učitam VPN korisničko sučelje."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Ne mogu da nađem VPN priključak za „%s“."
 
-#: ../src/connection-editor/page-vpn.c:202
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:208
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Izbor vrste VPN veze"
 
-#: ../src/connection-editor/page-vpn.c:209
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3945,7 +4141,7 @@ msgstr ""
 "vrsta VPN veze koju želite da napravite ne pojavi na spisku, možda nemate "
 "instaliran ispravan VPN priključak."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -3953,7 +4149,7 @@ msgstr ""
 "Ova opcija dodeljuje ovu vezu tački bežičnog pristupa (AP) koja je navedena "
 "ovde unetim BSSID-om. Npr: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -3963,95 +4159,93 @@ msgstr ""
 "nazivom ili trajnom MAK adresom ili sa oba. Npr: „wlan0“, "
 "„3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ne mogu da učitam korisničko sučelje za bežičnu mrežu."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Bežični uređaj"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Bežična veza %d"
 
-#: ../src/connection-editor/page-wifi-security.c:358
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "VEP 40/128-bitni ključ (Heks ili ASKRI)"
 
-#: ../src/connection-editor/page-wifi-security.c:368
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "VEP 128-bitna lozinka"
 
-#: ../src/connection-editor/page-wifi-security.c:394
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dinamički VEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Lični VPA & VPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:420
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni VPA & VPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:463
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Ne mogu da učitam bezbednosno korisničko sučelje za bežičnu mrežu; nedostaju "
 "podešavanja bežične mreže."
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Bežična bezbednost"
 
-#: ../src/connection-editor/page-wifi-security.c:476
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Ne mogu da učitam bezbednosno korisničko sučelje za bežičnu mrežu."
 
-#: ../src/connection-editor/page-wifi-security.c:560
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "nedostaje SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:566
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Bezbednost nije saglasna sa ad-hok režimom"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Već postoji datoteka „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Da li želite da zamenite %s VPN vezom pre čuvanja?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4062,218 +4256,103 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Izvezi VPN vezu…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Otključaj"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Samostalno otključajte ovaj uređaj"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Podaci o vezi"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktivne veze mreže"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Nije podešeno uverenje"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Nije podešen ključ"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Izaberite ključ za „%s“ uverenje"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
-#, c-format
-msgid "%s private _key:"
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
+#, fuzzy, c-format
+msgid "%s private _key"
 msgstr "„%s“ privatni _ključ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
-#, c-format
-msgid "%s key _password:"
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
+#, fuzzy, c-format
+msgid "%s key _password"
 msgstr "„%s“ _lozinka ključa:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Izaberite „%s“ uverenje"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
-#, c-format
-msgid "%s _certificate:"
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
+#, fuzzy, c-format
+msgid "%s _certificate"
 msgstr "„%s“ _uverenje:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Vaša mobilna širokopojasna veza je podešena sa sledećim parametrima:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Vaš uređaj:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Vaš povajder:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Vaš plan:"
-
-#: ../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."
-msgstr ""
-"Sada će biti napravljena veza sa vašim izdavačem mobilnih širokopojasnih "
-"usluga na osnovu podešavanja koje ste uneli. Ukoliko ne uspete da se povežete "
-"na mrežu, proverite ponovo uneta podešavanja. Za izmenu podešavanja, izaberite "
-"„Veze sa mrežom“ iz izbornika Sistem → Postavke."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Potvrdite mobilnu širokopojasnu vezu"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Moja zemlja nije na spisku"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Neizlistano"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Izaberi moj plan:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Izabrani _NTP plan (Naziv tačke pristupa):"
-
-#: ../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."
-msgstr ""
-"Upozorenje: Izbor neispravnog plana može da utiče na način plaćanja "
-"širokopojasne mreže ili da onemogući povezivanje.\n"
-"\n"
-"Ukoliko niste sigurni za način plaćanja zatražite APN plan od izdavača "
-"Internet usluge."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Izaberite plan naplate"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Moj plan nije na spisku…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Izaberi izdavača Internet usluga sa _spiska:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Dostavljač"
 
-#: ../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:"
-msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Izdavač:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Moj izdavač koristi GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Moj izdavač koristi CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Izaberite izdavača usluga"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Spisak država ili regiona:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Država ili region"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Moja zemlja nije na spisku"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
-msgstr "Izaberite državu ili region vašeg dostavljača usluga"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Bilo koji uređaj"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Nova mobilna, širokopojasna veza"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4281,216 +4360,289 @@ msgstr ""
 "Ovaj čarobnjak će vam pomoći da lako podesite mobilnu širokopojasnu vezu sa "
 "3G mrežom."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Potrebni su vam sledeći podaci:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Ime izdavača širokopojasne usluge"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Ime širokopojasnog plana naplate"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(u nekim slučajevima) vaš plan širokopojasne naplate za APN (Naziv tačke "
 "pristupa)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Bilo koji uređaj"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Podesi mobilnu, širokopojasnu vezu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Nova mobilna, širokopojasna veza"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Država ili region"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
+msgstr "Izaberite državu ili region vašeg dostavljača usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Izaberi izdavača Internet usluga sa _spiska:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Moj izdavač koristi GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Moj izdavač koristi CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Izaberite izdavača usluga"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Izaberi moj plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Izabrani _NTP plan (Naziv tačke pristupa):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 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."
+msgstr ""
+"Upozorenje: Izbor neispravnog plana može da utiče na način plaćanja "
+"širokopojasne mreže ili da onemogući povezivanje.\n"
+"\n"
+"Ukoliko niste sigurni za način plaćanja zatražite APN plan od izdavača "
+"Internet usluge."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Izaberite plan naplate"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Vaša mobilna širokopojasna veza je podešena sa sledećim parametrima:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Vaš uređaj:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Vaš povajder:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Vaš plan:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 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."
+msgstr ""
+"Sada će biti napravljena veza sa vašim izdavačem mobilnih širokopojasnih "
+"usluga na osnovu podešavanja koje ste uneli. Ukoliko ne uspete da se "
+"povežete na mrežu, proverite ponovo uneta podešavanja. Za izmenu "
+"podešavanja, izaberite „Veze sa mrežom“ iz izbornika Sistem → Postavke."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Potvrdite mobilnu širokopojasnu vezu"
 
-#: ../src/libnma/nma-cert-chooser-button.c:165
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Ništa)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:173
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Ključ u „%s“"
 
-#: ../src/libnma/nma-cert-chooser-button.c:174
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Uverenje u „%s“"
 
-#: ../src/libnma/nma-cert-chooser-button.c:193
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Nepoznato)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:215
-#: ../src/libnma/nma-cert-chooser-button.c:245
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../src/libnma/nma-cert-chooser-button.c:216
-#: ../src/libnma/nma-cert-chooser-button.c:246
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../src/libnma/nma-cert-chooser-button.c:472
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Izaberi iz datoteke…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Izaberite „%s“ uverenje"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
-#, c-format
-msgid "%s certificate _password:"
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
 msgstr "_Lozinka „%s“ uverenja:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Greška prijavljivanja"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Greška otvaranja sesije"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Otključaj modul"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Izdaje ga"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Unesite „%s“ PIN"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Prijavi me"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Zapamti PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Sačuvaj lozinku samo za ovog korisnika"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Sačuvaj lozinku za sve korisnike"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Uvek zatraži ovu lozinku"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Lozinka nije potrebna"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Druga lozinka:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "Prikaži _lozinke"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Treća lozinka:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:238
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
-msgid "Sh_ow passwords"
-msgstr "Prikaži _lozinke"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Druga lozinka:"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Pritisnite da se povežete"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Ili nedostaje lozinka ili je veza neispravna. U svakom slučaju, prvo ćete "
-"morati da uredite vezu u uređivaču veza"
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Novo…"
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamički VEP (802.1h)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1070 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Potrebne su lozinke ili ključevi šifrovanja za pristup bežičnoj mreži „%s“."
 
-#: ../src/libnma/nma-wifi-dialog.c:1151 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1153 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bežična mreža zahteva potvrđivanje identiteta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Napravi novu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nova bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Unesite naziv za novu bežičnu mrežu."
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se na skrivenu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4498,35 +4650,54 @@ msgstr ""
 "Unesite naziv i bezbednosne podatke za skrivenu bežičnu mrežu na koju želite "
 "da se povežete."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Bežična _bezbednost:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Veza:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Bežični _uređaj:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Ne mogu da nađem izdavača i želim da ga unesem _ručno:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Izdavač:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Spisak država ili regiona:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Država ili region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Žičana"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC mrežica"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4536,17 +4707,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Ili nedostaje lozinka ili je veza neispravna. U svakom slučaju, prvo ćete "
+"morati da uredite vezu u uređivaču veza"
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Bežična _bezbednost:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Ime mreže:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Veza:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Bežični _uređaj:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4554,7 +4749,7 @@ msgstr ""
 "Ovaj program je deo Upravnika mreže (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4562,325 +4757,350 @@ msgstr ""
 "Ovaj program nije namenjen za rad u liniji naredbi, već je deo Gnomovog "
 "radnog okruženja."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nije omogućeno"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nije registrovan"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kućna mreža (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Kućna mreža"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "pretražujem"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija je odbijena"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mreža u romingu (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Mreža u romingu"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN kod za SIM karticu „%s“ na „%s“"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Potreban je PIN kôd"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Potreban je PIN kod za povezivanje mobilnog širokopojasnog uređaja"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Povezani ste na mobilnu širokopojasnu vezu „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "prebacivanje"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s veza"
 
-#: ../src/utils/utils.c:565
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM uverenja (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:577
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, ili PKCS#12 lični ključevi (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "nepoznata greška u 802.1X bezbednosti (vpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "Nije izabrano uverenje"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "izabrana datoteka uverenja ne postoji"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Izaberi PAC datoteku"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Potvrđenim identitetom"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Oba"
 
-#: ../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:3
-msgid "Anony_mous identity:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Anonimni _identitet:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _datoteka:"
 
 # ~Miloš
-#: ../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:1
-msgid "_Inner authentication:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_Unutrašnja prijava:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Izdanje 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Izdanje 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Nije potrebno _uverenje"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP _izdanje:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Sufiks naziva uverenja servera."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
-msgid "_Domain:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+#, fuzzy
+msgid "_Domain"
 msgstr "_Domen:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "VEP 128-bitna lozinka"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Prikaži _lozinke"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "nije izabrano korisničko uverenje"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "izabrana datoteka korisničkog uverenja ne postoji"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "nije izabran ključ"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "izabrana datoteka ključa ne postoji"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+#: src/wireless-security/eap-method-tls.ui:20
+#, fuzzy
+msgid "I_dentity"
 msgstr "_Identitet:"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (bez EAP-a)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Nepoznata greška proveravanja 802.1X bezbednosti"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "LZNK"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS kroz tunel"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "nedostaje leap korisničko ime"
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "nedostaje leap lozinka"
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "nedostaje vep ključ"
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
-msgstr "neispravan vep ključ: ključ dužine %zu mora da sadrži samo heksa-brojeve"
+msgstr ""
+"neispravan vep ključ: ključ dužine %zu mora da sadrži samo heksa-brojeve"
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
-msgstr "neispravan vep ključ: ključ dužine %zu mora da sadrži samo askri znakove"
+msgstr ""
+"neispravan vep ključ: ključ dužine %zu mora da sadrži samo askri znakove"
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4889,39 +5109,41 @@ msgstr ""
 "neispravan vep ključ: pogrešna dužina ključa %zu. Ključ mora biti ili dužine "
 "5/13 (askri) ili 10/26 (heks)"
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "neispravan vep-ključ: lozinka ne sme biti prazna"
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "neispravan vep-ključ: lozinka mora biti kraća od 64 znaka"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Otvoreni sistem"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Deljeni ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Osnovno)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ključ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "P_rikaži ključ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "VEP _indeks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4930,24 +5152,87 @@ msgstr ""
 "neispravna vpa lozinka: neispravna dužina ključa %zu. Mora biti [8,63] bajta "
 "ili 64 heksa-broja"
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neispravna vpa lozinka: ne mogu da rastumačim ključ od 64 bajta kao "
 "heksadecimalni"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Vrsta:"
 
-#~ msgid "DSL"
-#~ msgstr "DSL"
+#~ msgid "%s (default)"
+#~ msgstr "%s (osnovno)"
+
+#~ msgid "Ignored"
+#~ msgstr "Zanemareno"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Ne mogu da ažururam lozinke veze zbog nepoznate greške."
+
+#~ msgid "Priority:"
+#~ msgstr "Važnost:"
+
+#~ msgid "0:"
+#~ msgstr "0:"
+
+#~ msgid "1:"
+#~ msgstr "1:"
 
-#~ msgid "Mode"
-#~ msgstr "Režim"
+#~ msgid "2:"
+#~ msgstr "2:"
 
-#~ msgid "MTU"
-#~ msgstr "MTU"
+#~ msgid "3:"
+#~ msgstr "3:"
+
+#~ msgid "4:"
+#~ msgstr "4:"
+
+#~ msgid "5:"
+#~ msgstr "5:"
+
+#~ msgid "6:"
+#~ msgstr "6:"
+
+#~ msgid "7:"
+#~ msgstr "7:"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "_Sam se poveži na ovu mrežu kada je dostupna"
+
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Prioritet veze za samostalno aktiviranje:"
+
+#~ msgid "Mode:"
+#~ msgstr "Režim:"
+
+#~ msgid "MTU:"
+#~ msgstr "MTU:"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Ne mogu da uvezem VPN vezu"
+
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Ne mogu da pročitam datoteku „%s“ ili ona ne sadrži poznate VPN podatke o "
+#~ "vezi\n"
+#~ "\n"
+#~ "Greška: %s."
+
+#~ msgid "unknown error"
+#~ msgstr "nepoznata greška"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Aktivne veze mreže"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
 
 #~ msgid "no file selected"
 #~ msgstr "nije izabrana datoteka"
@@ -4963,7 +5248,8 @@ msgstr "_Vrsta:"
 #~ msgstr "neispravno EAP-PEAP uverenje izdavača uverenja: %s"
 
 #~ msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-#~ msgstr "neispravno EAP-PEAP uverenje izdavača uverenja: uverenje nije navedeno"
+#~ msgstr ""
+#~ "neispravno EAP-PEAP uverenje izdavača uverenja: uverenje nije navedeno"
 
 #~ msgid "Choose a Certificate Authority certificate"
 #~ msgstr "Izaberite uverenje izdavača uverenja"
@@ -4975,7 +5261,8 @@ msgstr "_Vrsta:"
 #~ msgstr "neispravno EAP-TTLS uverenje izdavača uverenja: %s"
 
 #~ msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-#~ msgstr "neispravno EAP-TTLS uverenje izdavača uverenja: uverenje nije navedeno"
+#~ msgstr ""
+#~ "neispravno EAP-TTLS uverenje izdavača uverenja: uverenje nije navedeno"
 
 #~| msgid ""
 #~| "\n"
@@ -5001,7 +5288,8 @@ msgstr "_Vrsta:"
 #~ msgstr "neispravno EAP-TLS uverenje izdavača uverenja: %s"
 
 #~ msgid "invalid EAP-TLS CA certificate: no certificate specified"
-#~ msgstr "neispravno EAP-TLS uverenje izdavača uverenja: uverenje nije navedeno"
+#~ msgstr ""
+#~ "neispravno EAP-TLS uverenje izdavača uverenja: uverenje nije navedeno"
 
 #~ msgid "invalid EAP-TLS password: missing"
 #~ msgstr "neispravna EAP-TLS lozinka: nedostaje"
@@ -5053,30 +5341,6 @@ msgstr "_Vrsta:"
 #~ 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"
 
@@ -5158,12 +5422,6 @@ msgstr "_Vrsta:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Sekundarni DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Tercijarni DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "_MAK adresa uređaja:"
 
@@ -5220,8 +5478,8 @@ msgstr "_Vrsta:"
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
 #~ msgstr ""
-#~ "Nije moguće podešavanje Blututa (nisam uspeo da se povežem na D-sabirnicu: "
-#~ "(%s) %s)."
+#~ "Nije moguće podešavanje Blututa (nisam uspeo da se povežem na D-"
+#~ "sabirnicu: (%s) %s)."
 
 #~ msgid ""
 #~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
diff --git a/po/sv.po b/po/sv.po
index 61fdea27..b136ebff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManagerApplet\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2018-09-21 08:06+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2018-10-20 23:01+0200\n"
 "Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -23,49 +23,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Hantera dina nätverksanslutningar"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-list.ui.h:1
-msgid "Network Connections"
-msgstr "Nätverksanslutningar"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Råkonfiguration"
+
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Hantera och ändra inställningar för dina nätverksanslutningar"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Inaktivera anslutningsaviseringar"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Sätt till true (sant) för att inaktivera aviseringar vid anslutning till ett "
 "nätverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Inaktivera aviseringar om frånkopplingar"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Sätt till true (sant) för att inaktivera aviseringar när du kopplar från ett "
 "nätverk."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Inaktivera VPN-aviseringar"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -73,53 +82,54 @@ msgstr ""
 "Sätt till true (sant) för att inaktivera aviseringar när du ansluter till "
 "eller kopplar från ett VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Visa inte aviseringar om tillgängliga nätverk"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Sätt till true (sant) för att inaktivera aviseringar när trådlösa nätverk är "
 "tillgängliga."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Stämpel"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Används för att fastställa huruvida inställningar ska migreras till en ny "
 "version."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Inaktivera skapande av trådlöst nätverk"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Sätt till true (sant) för att inaktivera skapandet av adhoc-nätverk när du "
 "använder miniprogrammet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Visa miniprogrammet i aviseringsytan"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Sätt till FALSE (falskt) för att inaktivera visning av miniprogrammet i "
 "aviseringsytan."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Ignorera CA-certifikat"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -127,7 +137,7 @@ msgstr ""
 "Sätt till true (sant) för att inaktivera varningar om CA-certifikat i EAP-"
 "autentisering."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -135,15 +145,15 @@ msgstr ""
 "Sätt till true (sant) för att inaktivera varningar om CA-certifikat i fas 2 "
 "av EAP-autentisering."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "Nätverkshanteraren"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "Nätverkshanteraren (anslutningsredigerare)"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
@@ -151,7 +161,7 @@ msgstr ""
 "Nätverkshanteraren är en systemtjänst för att hantera och konfigurera dina "
 "nätverksanslutningar och nätverksenheter."
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -159,21 +169,21 @@ msgstr ""
 "Programmet nm-connection-editor arbetar med Nätverkshanteraren för att skapa "
 "och redigera befintliga profiler för Nätverkshanteraren."
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "Utvecklarna av Nätverkshanteraren"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "objektklassen ”%s” har ingen egenskap med namn ”%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "egenskapen ”%s” för objektklassen ”%s” är skrivskyddad"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
@@ -181,20 +191,20 @@ msgstr ""
 "konstruktionsegenskapen ”%s” för objektet ”%s” kan inte ställas in efter att "
 "det skapas"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr ""
 "”%s::%s” är inte ett giltigt egenskapsnamn; ”%s” är inte en undertyp till "
 "GObject"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr ""
 "kunde inte ange egenskapen ”%s” för typen ”%s” från värdet av typen ”%s”"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -203,81 +213,80 @@ msgstr ""
 "värdet ”%s” av typen ”%s” är ogiltigt eller utanför intervallet för "
 "egenskapen ”%s” av typen ”%s”"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1062
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1068
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 msgid "_Network name"
 msgstr "_Nätverksnamn"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "säker."
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Misslyckades med att lägga till/aktivera anslutningen"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Anslutningsfel"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Frånkoppling av enhet misslyckades"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Fel vid frånkoppling"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Aktivering av anslutning misslyckades"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "Visa inte detta meddelande igen"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -288,7 +297,7 @@ msgstr ""
 "VPN-anslutningen ”%s” kopplades från på grund av att nätverksanslutningen "
 "avbröts."
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -299,7 +308,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att nätverksanslutningen "
 "avbröts."
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -309,7 +318,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten oväntat "
 "stoppades."
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -320,7 +329,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten svarade med "
 "ogiltig konfiguration."
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +339,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att tidsgränsen för "
 "anslutningsförsöket överskreds."
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +349,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten inte "
 "startade i tid."
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +359,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten misslyckades "
 "med att starta."
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -360,7 +369,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att det inte fanns några "
 "giltiga VPN-hemligheter."
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +378,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” misslyckades på grund av ogiltiga VPN-hemligheter."
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -378,7 +387,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” misslyckades."
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -389,19 +398,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-anslutningen etablerades.\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN-inloggningsmeddelande"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN-anslutningen misslyckades"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -415,7 +424,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -428,561 +437,572 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "enheten är inte redo (fast programvara saknas)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "enheten är inte redo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "frånkopplad"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Koppla från"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "enheten hanteras inte"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Inga nätverksenheter finns tillgängliga"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN-anslutningar"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "_Konfigurera VPN…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "_Lägg till en VPN-anslutning…"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Nätverkshanteraren är inte igång…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Nätverk inaktiverat"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Aktivera _nätverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "A_ktivera trådlöst nätverk"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivera _mobilt bredband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Aktivera a_viseringar"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Anslutnings_information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Redigera anslutningar…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Du är nu ansluten till ”%s”."
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Nätverksanslutningen har kopplats från."
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Förbereder nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Användarautentisering krävs för nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Begär en nätverksadress för ”%s”…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "Nätverksanslutningen ”%s” är aktiv"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Startar VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Användarautentisering krävs för VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Begär en VPN-adress för ”%s”…"
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN-anslutning aktiv"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ingen nätverksanslutning"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Miniprogram för nätverkshantering"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Felaktig PUK-kod; kontakta din leverantör."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Felaktig PIN-kod; kontakta din leverantör."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "Skickar upplåsningskod…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredband (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Mobilt bredband"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Tillgängliga"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "Ny mobil bredbandsanslutning…"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Anslutning etablerad"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du är nu ansluten till det mobila bredbandsnätverket."
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbandsnätverk."
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Du är nu registrerad på hemmanätverket."
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Du är nu registrerad på ett roaming-nätverk."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du är nu ansluten till det mobila bredbandsnätverket."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Förbereder mobila bredbandsanslutningen ”%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Konfigurerar mobila bredbandsanslutningen ”%s”…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Användarautentisering krävs för mobila bredbandsanslutningen ”%s”…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Mobila bredbandsanslutningen ”%s” är aktiv"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatiskt trådbundet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Trådbundna nätverk (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Trådbundet nätverk (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Trådbundna nätverk"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Trådbundet nätverk"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Du är nu ansluten till det trådbundna nätverket."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Förbereder trådbunden nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Konfigurerar trådbunden nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Användarautentisering krävs för trådbunden nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Begär en trådbunden nätverksadress för ”%s”…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Trådbunden nätverksanslutning ”%s” är aktiv"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "_Anslut till dolt trådlöst nätverk…"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "Skapa _nytt trådlöst nätverk…"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Misslyckades med att lägga till nya anslutningen"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "Otillräckliga rättigheter."
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Trådlösa nätverk (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Trådlöst nätverk (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Trådlöst nätverk"
 msgstr[1] "Trådlösa nätverk"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Trådlöst är inaktiverat"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Trådlöst är inaktiverat av hårdvaruväxel"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Fler nätverk"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Trådlösa nätverk tillgängliga"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Använd nätverksmenyn för att ansluta till ett trådlöst nätverk"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Du är nu ansluten till det trådlösa nätverket ”%s”."
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Förbereder trådlös nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Konfigurerar trådlös nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Användarautentisering krävs för trådlöst nätverk ”%s”…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Begär en trådlös nätverksadress för ”%s”…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Trådlös nätverksanslutning ”%s” är aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Trådlös nätverksanslutning ”%s” är aktiv"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Misslyckades med att aktivera anslutningen"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Fel vid visning av anslutningsinformation:"
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:448
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "Fler adresser"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (standard)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Okänd"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP-adress"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Broadcast-adress"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Subnätsmask"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Primär"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "_Sekundärt lösenord:"
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Hårdvaruadress"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Drivrutin"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Säkerhet:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Standardväg"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "Ignorera"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "Surfzon"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Lösenord:"
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN-typ"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN-gateway"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN-användarnamn"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN-banner"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Basanslutning"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Okänd"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Inga giltiga aktiva anslutningar hittades!"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -992,18 +1012,18 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "och många andra bidragsgivare och översättare"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniprogram i aviseringsytan för hantering av dina nätverksenheter och "
 "nätverksanslutningar."
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Webbplats för Nätverkshanterare"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Josef Andersson <l10nl18nsweja@gmail.com>\n"
@@ -1011,7 +1031,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1019,33 +1039,33 @@ msgstr ""
 "Miniprogram för nätverkshantering kunde inte hitta en del nödvändiga "
 "resurser (.ui-filen hittades inte)."
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Saknar resurser"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Nätverkslösenord för mobilt bredband"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Ett lösenord krävs för att ansluta till ”%s”."
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-upplåsning krävs"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-upplåsning krävs"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1054,25 +1074,25 @@ msgstr ""
 "Mobila bredbandsenheten ”%s” kräver en SIM PIN-kod innan den kan användas."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN-kod:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Visa PIN-kod"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-upplåsning krävs"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK-upplåsning krävs"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1081,43 +1101,43 @@ msgstr ""
 "Mobila bredbandsenheten ”%s” kräver en SIM PUK-kod innan den kan användas."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK-kod:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Ny PIN-kod:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Ange ny PIN-kod igen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Visa PIN/PUK-koder"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Anslutningen hade ingen VPN-inställning"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Misslyckades med att skriva anslutning till VPN-gränssnitt: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 "Misslyckades med att skriva anslutning till VPN-gränssnitt: inkomplett "
 "skrivning"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
@@ -1125,41 +1145,41 @@ msgstr ""
 "IP-adresser för att identifiera din dator på nätverket.  Klicka på knappen "
 "”Lägg till” för att lägga till en IP-adress."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "I_gnorera automatiskt mottagna rutter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Använd endast d_enna anslutning för resurser på dess nätverk"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1167,15 +1187,15 @@ msgstr ""
 "Om aktiverad så kommer denna anslutning aldrig att användas som "
 "standardnätverksanslutning."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "S_kapa…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Välj en anslutningstyp"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1187,84 +1207,93 @@ msgstr ""
 "Om du skapar en VPN och VPN-anslutningen du vill skapa inte visas i listan, "
 "kanske du inte har rätt VPN-insticksprogram installerat."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr "_Enhet"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Aktiv backup"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Utsändning"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Adaptiv sändarlastbalansering"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Adaptiv lastbalansering"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (rekommenderad)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 msgid "Bonded _connections"
 msgstr "_Kombinerade anslutningar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 msgid "M_ode"
 msgstr "Lä_ge"
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 msgid "Monitoring _frequency"
 msgstr "Övervaknings_frekvens"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 msgid "_Interface name"
 msgstr "Gränssn_ittsnamn"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 msgid "_Link Monitoring"
 msgstr "_Länkövervakning"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 msgid "ARP _targets"
 msgstr "ARP-_mål"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1272,19 +1301,19 @@ msgstr ""
 "En IP-adress, eller en kommaseparerad lista med IP-adresser, att leta efter "
 "när du kontrollerar länkstatus."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 msgid "Link _up delay"
 msgstr "Fördröjning då länk _uppe"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 msgid "Link _down delay"
 msgstr "Fördröjning då länk _nere"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 msgid "_Primary"
 msgstr "_Primär"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1292,66 +1321,69 @@ msgstr ""
 "Gränssnittsnamnet på den primära enheten. Om inställt, kommer enheten alltid "
 "att vara den aktiva slaven när den är tillgänglig."
 
-#: ../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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "byte"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 msgid "Path _cost"
 msgstr "Sökvägs_kostnad"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 msgid "_Hairpin mode"
 msgstr "_Hårnålsläge"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 msgid "Bridged _connections"
 msgstr "Br_yggade anslutningar"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 msgid "_Forward delay"
 msgstr "Fördröjning _framåt"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 msgid "_Hello time"
 msgstr "_Hallåtid"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "Vidarebefordransfördröjning i sekunder för STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "Hallå-tid i sekunder för STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "Aktivera I_GMP-avlyssning"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1362,17 +1394,17 @@ msgstr ""
 "systemet komma att vägra att aktivera egenskapen tills kollisionerna är "
 "lösta."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Aktivera _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 "Styr huruvida Spanning Tree Protocol (STP) är aktiverat för denna brygga"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
@@ -1380,27 +1412,27 @@ msgstr ""
 "Anger prioriteten för STP för denna brygga. Lägre värden är ”bättre”; den "
 "lägsta prioritetsbryggan kommer att väljas som rotbrygga."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 msgid "_Max age"
 msgstr "_Maxålder"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "Högsta meddelandeålder i sekunder för STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 msgid "_Aging time"
 msgstr "_Åldringstid"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "Åldringstid för Ethernet-MAC-adress i sekunder"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr "_Gruppvidarebefordrad mask"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1412,40 +1444,40 @@ msgstr ""
 "inte ha bitarna 0, 1 eller 2 satta eftersom de används för STP, MAC-"
 "pausramar och LACP."
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "standard"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "ospecificerat fel"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "Bevara"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "Permanent"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "Slumpmässig"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "Stabil"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1455,182 +1487,225 @@ msgstr ""
 "nätverksenheten som denna anslutning är aktiverad på.  Denna funktion är "
 "känd som MAC-kloning eller ”spoofing”.  Exempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC-adress"
 
 # placeras i meningen "ogiltig %s...", så liten bokstav
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "Hårdvaruadress"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "ogiltig %s för %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "ogiltig %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "ogiltigt gränssnittsnamn för %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "ogiltigt gränssnittsnamn (%s): "
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "kan inte tolka enhetsnamn"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "ogiltig hårdvaruadress"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "ogiltig %s (%s): "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "enhet"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "ogiltig %s (%s) "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "_Använd Data Center Bridging (DCB) för denna anslutning"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Flödeskontroll"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Funktion"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Annonsera"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Villig"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "Alternativ…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Prioriterade grupper"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Struktur"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Prioritetsflödeskontroll"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Aktivera eller inaktivera prioritetspausöverföring för varje "
 "användarprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 msgid "0"
 msgstr "0"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 msgid "1"
 msgstr "1"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 msgid "5"
 msgstr "5"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 msgid "6"
 msgstr "6"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 msgid "7"
 msgstr "7"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 msgid "Traffic Class"
 msgstr "Trafikklass"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 msgid "Strict Bandwidth"
 msgstr "Strikt bandbredd"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 msgid "Priority Bandwidth"
 msgstr "Prioriterad bandbredd"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 msgid "Group Bandwidth"
 msgstr "Gruppbandbredd"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 msgid "Group ID"
 msgstr "Grupp-ID"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Ange prioritetsgrupps-ID för varje användarprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1638,34 +1713,34 @@ msgstr ""
 "Ange tillåten länkbandbreddsprocent varje Prioritetsgrupp får använda.  "
 "Summan av alla grupper måste uppgå till 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Ange procentandel av prioritetsgruppens bandbredd varje användarprioritet "
 "får använda."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Aktivera eller inaktivera bandbredd för varje användarprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Ange trafikklass för varje användarprioritet."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 msgid "_Username"
 msgstr "An_vändarnamn"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "Användarnamn som används för att autentisera mot PPPoE-tjänsten."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
@@ -1673,53 +1748,52 @@ msgstr ""
 "Initiera endast sessioner med åtkomstkoncentratorer som tillhandahåller "
 "specifik tjänst. För de flesta leverantörer ska detta vara tomt."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 msgid "_Service"
 msgstr "_Tjänst"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "Vi_sa lösenord"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "Lösenord använt för att autentisera med PPPoE-tjänsten."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 msgid "_Password"
 msgstr "_Lösenord"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 msgid "PPP _interface"
 msgstr "_PPP-gränssnitt"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 msgid "P_arent interface"
 msgstr "_Föräldragränssnitt"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr ""
 "Ett tillfälligt namn att tilldela till det nyligen skapade PPP-gränssnittet."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "Gränssnittet för vilket PPP-anslutningen kommer att etableras."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 msgid "C_laim interface"
 msgstr "_Gör anspråk på gränssnitt"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1731,138 +1805,131 @@ msgstr ""
 "Observera att alternativet endast kan användas för Ethernet-gränssnitt. nm-"
 "applet kan endast aktivera anslutningen om detta alternativ har valts."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "Halv"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "Hel"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 msgid "_Port"
 msgstr "_Port"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-msgid "_Device"
-msgstr "_Enhet"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 msgid "C_loned MAC address"
 msgstr "K_lonad MAC-adress"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 msgid "Wake on LAN"
 msgstr "Wake on LAN"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "Stan_dard"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "_Ignorera"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Fys"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "_Utsändning"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 msgid "_Wake on LAN password"
 msgstr "_Wake-on-LAN-lösenord"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 "Wake-on-LAN-lösenord (en trådbunden MAC-adress). Det är bara giltigt för "
 "magiska paket."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr "Län_kförhandling"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1872,11 +1939,11 @@ msgstr ""
 "”Duplex” att tvingas utan att kontrollera enhetskompatibiliteten. Om osäker, "
 "skriv här ”Ignore” eller välj ”Automatic”."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 msgid "_Speed"
 msgstr "_Hastighet"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1886,11 +1953,11 @@ msgstr ""
 "”Ignore” och ”Automatic” inte är valda. Innan ett hastighetsvärde anges, "
 "försäkra dig om att din enhet stödjer det."
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 msgid "Duple_x"
 msgstr "Duple_x"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1900,31 +1967,31 @@ msgstr ""
 "”Ignore” och ”Automatic” inte är valda. Innan ett duplexvärde anges, "
 "försäkra dig om att din enhet stödjer det."
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 msgid "No"
 msgstr "Nej"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Alla användare får ansluta till detta _nätverk"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 msgid "Automatically connect to _VPN"
 msgstr "Anslut automatiskt till _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 msgid "Firewall _zone"
 msgstr "Brandväggs_zon"
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 msgid "_Metered connection"
 msgstr "_Anslutning med datakvot"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1936,11 +2003,11 @@ msgstr ""
 "”Nej”) för att informera program eller ”Automatisk” för att använda ett "
 "standardvärde baserat på anslutningstypen och andra mätvärden."
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 msgid "Connect _automatically with priority"
 msgstr "Anslut _automatiskt till med prioritet"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1949,7 +2016,7 @@ msgstr ""
 "Anslutningsprioritet för automatisk aktivering. Anslutningar med högre tal "
 "föredras vid val av profiler för automatisk aktivering. Standardvärde är 0."
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1958,7 +2025,7 @@ msgstr ""
 "”Lägg till” för att lägga till en statisk IP-adress att konfigureras utöver "
 "de automatiska."
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1970,126 +2037,125 @@ msgstr ""
 "till” för att lägga till en IP-adress. Om ingen adress ges kommer en adress "
 "att bestämmas automatiskt."
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "Automatiskt, statiska adresser"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "Adress (valfritt)"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 msgid "_Transport mode"
 msgstr "_Transportsätt"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr "Enhetsnamn"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr "Överordnad enhet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr "Läge"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr "Lokal IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr "Fjärr-IP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr "Indatanyckel"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr "Utdatanyckel"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr "MTU"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Automatisk med manuella DNS-inställningar"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Lokal länk"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Delade med andra datorer"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 msgid "_Method"
 msgstr "_Metod"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2099,8 +2165,8 @@ msgstr ""
 "dators konfiguration.  Om du vill använda en DHCP-klientidentifierare så kan "
 "du ange den här."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -2108,25 +2174,23 @@ msgstr ""
 "Domäner som används för att slå upp värdnamn. Använd kommatecken för att "
 "separera flera domäner."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 msgid "D_HCP client ID"
 msgstr "D_HCP-klient-ID"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 msgid "S_earch domains"
 msgstr "Sökd_omäner"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 msgid "DNS ser_vers"
 msgstr "_DNS-servrar"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2134,11 +2198,11 @@ msgstr ""
 "IP-adresser för domännamnsservrar som används för att slå upp värdnamn. "
 "Använd kommatecken för att separera flera adresser till domännamnsservrar."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Kräv IPv_4-adressering för att färdigställa denna anslutning"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2147,34 +2211,34 @@ msgstr ""
 "färdigställas om IPv4-konfigurationen misslyckas men IPv6-konfigurationen "
 "lyckas."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Rutter…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Aktiverad (föredra publik adress)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Aktiverad (föredra temporär adress)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "Stabil sekretess"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2185,19 +2249,19 @@ msgstr ""
 "Länklokala-adresser kommer automatiskt att omfattas i "
 "anslutningsgränssnittet."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 msgid "IPv6 _privacy extensions"
 msgstr "_Sekretesstillägg för IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr "Adress_genereringsläge för IPv6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Kräv IPv_6-adressering för att färdigställa denna anslutning"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2206,28 +2270,28 @@ msgstr ""
 "färdigställas om IPv6-konfigurationen misslyckas men IPv4-konfigurationen "
 "lyckas."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "Kontroll"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "Strikt"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "Namnet på MACsec-enheten."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
@@ -2235,7 +2299,7 @@ msgstr ""
 "Överordnat gränsnittsnamn eller anslutnings-UUID från vilken detta MACSEC-"
 "gränssnitt ska skapas."
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
@@ -2243,15 +2307,15 @@ msgstr ""
 "Överordnat gränsnittsnamn eller anslutnings-UUID från vilken detta MACsec-"
 "gränssnitt ska skapas"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " Fördelat namn för Connectivity-association Key"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "Fördelad Connectivity-association Key"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2260,202 +2324,203 @@ msgstr ""
 "Anger hur CAK (Connectivity Association Key) för MKA (MACsec Key Agreement) "
 "erhålls. För EAP-läge, fyll i parametrarna i säkerhetssidan för 802.1X"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr "CKN"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr "CAK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr "Nycklar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr "Validering"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr "SCI-port"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "Specificerar valideringsläge för inkommande ramar"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "Huruvida den överförda trafiken måste vara krypterad"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "Portkomponenten för SCI (Secure Channel Identifier)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 msgid "Nu_mber"
 msgstr "Num_mer"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 msgid "_APN"
 msgstr "_APN"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 msgid "N_etwork ID"
 msgstr "N_ätverks-ID"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "Ändra…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 msgid "P_IN"
 msgstr "P_IN-kod"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Tillåt _roaming om hemnätverket inte finns tillgängligt"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Visa _lösenord"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 msgid "Allowed methods"
 msgstr "Tillåtna metoder"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Konfigurera _metoder…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "A_nvänd Point-to-Point-kryptering (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Kräv 128-bitars kryptering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Använd _Stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Tillåt _BSD-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Tillåt _Deflate-datakomprimering"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Använd komprimering av TCP-_huvud"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Eko"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Skicka PPP-_ekopaket"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "Ingen"
 
 # möjligen browser -> webbläsare
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "Endast för webbläsare"
 
 # möjligen browser -> webbläsare
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "Använd denna proxykonfiguration endast för webbläsarklienter/scheman."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr "PAC-URL"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr "PAC-skript"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "URL från var PAC-skriptet ska hämtas."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "Importera skript från en fil…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 msgid "Method"
 msgstr "Metod"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "Av_ancerat…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "Satt av master"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "Trådbundna nätverk"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "Avancerade alternativ för grupper"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr "_Kö-ID"
 
 # NA = Neighbor Advertisement
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
@@ -2463,20 +2528,20 @@ msgstr ""
 "Antal utbrott av oönskade NA-paket och meningslösa ARP-paket som sänds efter "
 "att port är inaktiverad eller aktiverad."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "Kö-ID för vilken kö denna port ska mappas till."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Köralternativ för aktiv-säkerhetskopia"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 msgid "_Port priority"
 msgstr "_Portprioritet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of notify-peer packets."
@@ -2484,32 +2549,32 @@ msgstr ""
 "Värdet är en positiv siffra i millisekunder. Specificerar ett intervall "
 "mellan utbrott av avisera-till-motpart-paket."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "Portprioritet. Högre siffra betyder högre prioritet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "Port _fast"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr "Avmarkera inte porten om en bättre blir tillgänglig."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "Köralternativ för LACP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 msgid "_LACP port priority"
 msgstr "_LACP-portprioritet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 msgid "LACP port _key"
 msgstr "LACP-port_nyckel"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 msgid ""
 "Number of bursts of multicast group rejoin requests sent after port is "
 "enabled or disabled."
@@ -2517,15 +2582,15 @@ msgstr ""
 "Antal utbrott av återanslutsbegäran för multicastgrupper som skickats efter "
 "att port aktiverats eller inaktiveras."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr ""
 "Portprioritet enligt LACP-standard. Lägre siffra betyder högre prioritet."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 msgid ""
 "Value is positive number in milliseconds. Specifies an interval between "
 "bursts of multicast group rejoin requests."
@@ -2533,7 +2598,7 @@ msgstr ""
 "Värdet är en positiv siffra i millisekunder. Specificerar ett intervall "
 "mellan utbrott av återanslutsbegäran för multicastgrupper."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
@@ -2541,56 +2606,56 @@ msgstr ""
 "Portnyckel enligt LACP-standard. Det är endast möjligt att aggregera portar "
 "med samma nycklar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr "_Länkövervakare"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 msgid "_Up delay"
 msgstr "Fördröjning då _uppe"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 msgid "_Down delay"
 msgstr "Fördröjning då _nere"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 msgid "Send _interval"
 msgstr "Sänd_intervall"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 msgid "Delay _before first send"
 msgstr "Fördröjning _innan första utskicket"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:29
-#: ../src/connection-editor/ce-page-team.ui.h:75
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr "_Högsta antal missade svar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 msgid "_Source host"
 msgstr "_Källvärd"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 msgid "_Target host"
 msgstr "_Målvärd"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 msgid ""
 "Maximum number of missed replies. If this number is exceeded, link is "
 "reported as down."
 msgstr ""
 "Högst antal missade svar. Om siffran överskrids rapporteras länken som nere."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:33
-#: ../src/connection-editor/ce-page-team.ui.h:79
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
@@ -2598,8 +2663,8 @@ msgstr ""
 "Värdnamn att konvertera till IP-adress som kommer att fyllas till ARP-"
 "begäran som källadress."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
@@ -2607,13 +2672,13 @@ msgstr ""
 "Värdnamn att konvertera till IP-adress som kommer att fyllas till begäran "
 "som destinationsadress."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "Ignorera ogiltiga paket från _aktiva portar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2621,13 +2686,13 @@ msgstr ""
 "Validera mottagna ARP-paket på aktiva portar. Om detta inte är ikryssat "
 "kommer alla inkommande ARP-paket att ses som giltiga svar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "Ignorera ogiltiga paket från _inaktiva portar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2635,13 +2700,13 @@ msgstr ""
 "Validera mottagna ARP-paket på inaktiva portar. Om detta inte kontrolleras "
 "kommer alla inkommande ARP-paket att ses som bra svar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "S_kicka på inaktiva portar"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
@@ -2649,180 +2714,179 @@ msgstr ""
 "Som standard skickas ARP-begäran endast på aktiva portar. Denna flagga "
 "tillåter att skicka även på inaktiva portar."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 msgid ""
 "The delay between the link coming up and the runner being notified about it."
 msgstr ""
 "Fördröjningen mellan länken som går upp och köraren som aviseras om det."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr ""
 "Fördröjningen mellan länken som går ner och köraren som aviseras om det."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "Intervallet mellan skickade begäran."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr ""
 "Fördröjningen mellan initiering av länkövervakare och den första skickade "
 "begäran."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "Länkövervakare att använda."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Länkövervakare"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "_Importera gruppkonfiguration från en fil…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 msgid "Edit _JSON configuration"
 msgstr "Redigera _JSON-konfiguration"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "Råkonfiguration"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "Högsta prioritet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "Högsta prioritet (stabil)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "Bandbredd"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "Högsta antal portar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "Portprioritet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "Från gruppenheten"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "Från den aktiva porten"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "Från aktiv enhet till gruppenhet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 msgid "_Teamed connections"
 msgstr "Gruppanslu_tningar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "Lastbalans"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Trådbundet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "L3-protokoll"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "L4-protokoll"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr "_Aviseringsantal för motpart"
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr "_Aviseringsintervall för motpart"
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr "_Multicast återanslutningsantal"
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr "_Multicast återanslutningsintervall"
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 msgid "_Hardware Address"
 msgstr "_Hårdvaruadress"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr ""
 "Önskad hårdvaruadress för ny gruppenhet. Vanligt MAC-adressformat accepteras."
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr "_Körare"
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 msgid "_Hardware address policy"
 msgstr "_Hårdvaruadresspolicy"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "Namn på körare att använda."
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 msgid ""
 "This defines the policy of how hardware addresses of team device and port "
 "devices should be set during the team lifetime."
@@ -2830,11 +2894,11 @@ msgstr ""
 "Detta definierar policyn för hur hårdvaruadresser för gruppenheter och "
 "portenheter ska sättas under grupplivscykeln."
 
-#: ../src/connection-editor/ce-page-team.ui.h:53
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "Skicka LACPDU-ramar _periodiskt"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2842,11 +2906,11 @@ msgstr ""
 "Om kryssat skickas LACPDU-ramar tillsammans med konfigurerade länkar "
 "periodiskt. Om inte, beter den sig enligt ”tala när tilltalad”."
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "Skicka en LACPDU-ram _varje sekund"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2856,23 +2920,23 @@ msgstr ""
 "skicka LACPDU-paket. Om kryssad kommer paket att skickas en gång per sekund. "
 "Annars skickas de var 30:e sekund."
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 msgid "_System priority"
 msgstr "_Systemprioritet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr "_Minsta antal portar"
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr "Policy för val av _aggregator"
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "Systemprioritet, värdet kan vara 0 - 65535."
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
@@ -2880,11 +2944,11 @@ msgstr ""
 "Specificerar minsta antal portar som måste vara aktiva innan försäkran om "
 "bärare i master-gränssnittet, värdet kan vara 1 - 255."
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "Detta väljer policy för hur aggregatorer väljs."
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
@@ -2892,184 +2956,180 @@ msgstr ""
 "Lista över fragmenttyper (strängar) vilka ska användas för beräkning av "
 "paketens Tx-hash."
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Fält för överföringshash"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "I tiondels sekunder. Periodiskt intervall mellan ombalansering."
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 "Namn på aktiv Tx-balanserare. Aktiv Tx-balansering är inaktiverat som "
 "standard."
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 msgid "Transmission _balancing interval"
 msgstr "Sändnings_balansintervall"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 msgid "_Transmission balancer"
 msgstr "Sändnings_balanserare"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "Körare"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 msgid "_Parent interface"
 msgstr "_Föräldragränssnitt"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 msgid "VLAN inter_face name"
 msgstr "VLAN-gränssnitts_namn"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 msgid "Cloned MAC _address"
 msgstr "Klonad MAC-_adress"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 msgid "VLAN _id"
 msgstr "VLAN-_ID"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr "Flaggor"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Ordna om huvuden"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Lös bindning"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Enhetsnamn + nummer"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "”vlan” + nummer"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 msgid "S_ecurity"
 msgstr "Sä_kerhet"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "Klient"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "Surfzon"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 msgid "Transmission po_wer"
 msgstr "Sändningss_tyrka"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 msgid "_Rate"
 msgstr "_Frekvens"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 msgid "C_hannel"
 msgstr "_Kanal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 msgid "Ban_d"
 msgstr "Ban_d"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 msgid "SS_ID"
 msgstr "SS_ID"
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Ingen polkit-behörighet för att utföra åtgärden"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Tillåtna autentiseringsmetoder"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3078,99 +3138,95 @@ msgstr ""
 "autentiseringsmetoder.  Om anslutningar misslyckas så kan du prova att "
 "inaktivera stöd för vissa metoder."
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Trådlöst"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Kombinerad"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Grupp"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Brygga"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP-tunnel"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr "Ingen VPN-tjänstetyp."
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 "VPN-insticksmodulen misslyckades med att importera VPN-anslutningen korrekt: "
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Välj fil att importera"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Hårdvara"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "Importera en sparad VPN-konfiguration…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -3178,84 +3234,82 @@ msgstr ""
 "Anslutningsredigerarens dialogruta kunde inte initieras på grund av ett "
 "okänt fel."
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Kunde inte skapa ny anslutning"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Misslyckades med att ta bort anslutning"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Är du säker på att du vill ta bort anslutningen %s?"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 msgid "_New Connection"
 msgstr "_Ny anslutning"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Adress"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Nätmask"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerar %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Redigerar namnlös anslutning"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "Saknar anslutningsnamn"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "Redigerare initieras…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "Anslutning kan inte ändras"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ogiltig inställning %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -3263,33 +3317,33 @@ msgstr ""
 "Anslutningsredigeraren kunde inte hitta en del nödvändiga resurser (.ui-"
 "filen hittades inte)."
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Spara alla ändringar gjorda för denna anslutning."
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autentisera för att spara denna anslutning för alla användare på datorn."
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Kunde inte skapa anslutning"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Kunde inte redigera anslutningen"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Okänt fel vid skapande av anslutningsredigeringsdialog."
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 msgid ""
 "Warning: the connection contains some properties not supported by the "
 "editor. They will be cleared upon save."
@@ -3297,19 +3351,19 @@ msgstr ""
 "Varning: anslutningen innehåller en del egenskaper som inte stöds av "
 "redigeraren. De kommer att rensas vid sparning."
 
-#: ../src/connection-editor/nm-connection-editor.c:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Fel vid initiering av redigerare"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Misslyckades med att lägga till anslutning"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "Rätta till"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
@@ -3317,23 +3371,23 @@ msgstr ""
 "Säkerhetsetiketter kan förhindra en del filer från att användas med "
 "certifikatsautentisering."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 msgid "Connection _name"
 msgstr "Anslutnings_namn"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "_Exportera…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "Filmärkning"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Märk om"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
@@ -3341,206 +3395,209 @@ msgstr ""
 "Följande filer är inte märkta för certifikatautentisering. Vill du justera "
 "märkningen?"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "Märk om"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "aldrig"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut sedan"
 msgstr[1] "%d minuter sedan"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timme sedan"
 msgstr[1] "%d timmar sedan"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dygn sedan"
 msgstr[1] "%d dygn sedan"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d månad sedan"
 msgstr[1] "%d månader sedan"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d år sedan"
 msgstr[1] "%d år sedan"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "Anslutning kan inte tas bort"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "Välj anslutning att redigera"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "Välj anslutning att ta bort"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Senast använd"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Redigera den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentisera för att redigera den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Ta bort den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentisera för att ta bort den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, c-format
+#: src/connection-editor/nm-connection-list.c:1059
 msgid "Unrecognized connection type"
 msgstr "Okänd anslutningstyp"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "Vet inte hur man importerar ”%s”-anslutningar"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 msgid "Error importing connection"
 msgstr "Fel vid import av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Fel vid skapande av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 msgid "Connection type not specified."
 msgstr "Ingen anslutningstyp angiven."
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Inga VPN-insticksmoduler är installerade."
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Vet inte hur man skapar ”%s”-anslutningar"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Fel vid redigering av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Kunde inte hitta en anslutning med UUID ”%s”"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Nätverksanslutningar"
+
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "Lägg till en ny anslutning"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X-säkerhet"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Kunde inte läsa in 802.1X säkerhetsanvändargränssnitt."
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Använd 802.1_X-säkerhet för denna anslutning"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Bluetooth-enhetens MAC-adress. Exempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Kunde inte läsa in Bluetooth-användargränssnitt."
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ogiltig Bluetoothenhet (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-anslutning %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "Bluetooth-typ"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Välj typen av anslutningsprofil för Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "_Personal Area Network"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "_Uppringt nätverk"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Kunde inte läsa in användargränssnitt för kombinerad anslutning."
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "primär"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Kombinerad anslutning %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Kunde inte läsa in brygganvändargränssnitt."
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brygganslutning %d"
@@ -3548,36 +3605,36 @@ msgstr "Brygganslutning %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Bryggport"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Kunde inte läsa in bryggportanvändargränssnitt."
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Kunde inte läsa in DCB-användargränssnitt."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Kunde inte läsa in DSL-användargränssnitt."
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "saknar föräldragränssnitt"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-anslutning %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3587,41 +3644,40 @@ msgstr ""
 "av dess gränssnitt eller av den permanenta MAC-adressen eller båda. Exempel: "
 "”em1”, ”3C:97:0E:42:1A:19”, ”em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "ignorerad"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Kunde inte läsa in trådbundet användargränssnitt."
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "Trådbunden enhet"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "klonad MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN-lösenord"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Trådbunden anslutning %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:806
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3631,11 +3687,11 @@ msgstr ""
 "zon, att markera det resulterar i att standardzonen som angivits i "
 "brandväggen används. Endast användbart om firewalld är aktivt."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Kunde inte läsa in allmänt användargränssnitt."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3647,166 +3703,158 @@ msgstr ""
 "”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)”"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Kunde inte läsa in InfiniBand-användargränssnitt."
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband-enhet"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-anslutning %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "Kunde inte läsa in användargränssnitt för IP-tunnel."
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP-tunnelanslutning %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Endast automatiska (VPN) adresser"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Automatiskt, endast adresser"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Endast automatiska (PPPoE) adresser"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Endast automatiska (DHCP) adresser"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Endast lokal länk"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 msgid "Additional DNS ser_vers"
 msgstr "Ytterligare DNS-ser_vrar"
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 msgid "Additional s_earch domains"
 msgstr "Ytterligare sökdomän_er"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redigerar IPv4-rutter för %s"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Inställningar för IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Kunde inte läsa in IPv4-användargränssnitt."
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4-adressen ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4-adressnätmasken ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4-gateway ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4-DNS-servern ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, endast DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerar IPv6-rutter för %s"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Inställningar för IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Kunde inte läsa in användargränssnitt för IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6-adressen ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6-prefixet ”%s” är ogiltigt"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6-gateway ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6-DNS-servern ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "Kunde inte läsa in MACsec-användargränssnitt."
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC-anslutning %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Duplikatslavar"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Slavar ”%s” och ”%s” gäller båda för enhet ”%s”"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3815,25 +3863,25 @@ msgstr ""
 "Slavar ”%s” och ”%s” gäller för olika virtuella portar (”%s” och ”%s”) för "
 "samma fysiska enhet."
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slav %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunde inte läsa in användargränssnitt för mobilt bredband."
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Anslutningstyp för mobilt bredband stöds inte."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Välj typ av mobil bredbandsleverantör"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
@@ -3841,85 +3889,85 @@ msgstr ""
 "Välj den teknik som din leverantör av mobilt bredband använder.  Fråga din "
 "leverantör om du är osäker."
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Min leverantör använder _GSM-baserad teknik (t.ex. GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Min leverantör använder C_DMA-baserad teknik (t.ex. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:287
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:349
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:282
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:317
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:302
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Redigerar PPP-autentiseringsmetoder för %s"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Inställningar för PPP"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Kunde inte läsa in PPP-användargränssnitt."
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "Kunde inte läsa in användargränssnitt för proxy."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "Fel: fil innehåller inte en giltig JSON-konfiguration"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Kunde inte läsa in gruppanvändargränssnitt."
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Gruppanslutning %d"
@@ -3927,68 +3975,67 @@ msgstr "Gruppanslutning %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Grupport"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Kunde inte läsa in grupportanvändargränssnitt."
 
 #. 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (via ”%s”)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "Ny anslutning…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Kunde inte läsa in vlan-användargränssnitt."
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "överordnad vlan"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-anslutning %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Kunde inte läsa in redigerar-VPN-insticksmodul för ”%s” (%s)."
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "okänt fel"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "Kunde inte läsa in VPN-användargränssnitt."
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "Kunde inte hitta VPN-insticksmodul för ”%s”."
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-anslutning %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Välj en VPN-anslutningstyp"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3998,7 +4045,7 @@ msgstr ""
 "typ av VPN-anslutning du önskar skapa inte finns i listan så kanske du inte "
 "har den korrekta VPN-insticksmodulen installerad."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -4007,7 +4054,7 @@ msgstr ""
 "accesspunkt (AP) som anges av det BSSID som anges här.  Exempel: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -4017,95 +4064,93 @@ msgstr ""
 "av dess gränssnitt eller av den permanenta MAC-adressen eller båda. Exempel: "
 "”wlan0”, ”3C:97:0E:42:1A:19”, ”wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kunde inte läsa in trådlöst användargränssnitt."
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Trådlös enhet"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Trådlös anslutning %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bitars nyckel (Hexadecimal eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitars lösenfras"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Dynamisk WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA och WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA och WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kunde inte läsa in användargränssnitt för trådlös säkerhet; saknar trådlös "
 "inställning."
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Trådlös säkerhet"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunde inte läsa in användargränssnitt för trådlös säkerhet."
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "saknat SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Säkerhet inte kompatibel med Ad-Hoc-läge"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "En fil med namnet ”%s” finns redan."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Vill du ersätta %s med VPN-anslutningen som du sparar?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Kan inte exportera VPN-anslutning"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4116,116 +4161,103 @@ msgstr ""
 "\n"
 "Fel: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "Exportera VPN-anslutning…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "Lås _upp"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Lås automatiskt upp denna enhet"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Anslutningsinformation"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "_Stäng"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Aktiva nätverksanslutningar"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:146
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "Inget certifikat angivet"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:170
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "Ingen nyckel angiven"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:370
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Välj en nyckel för %s-certifikat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:374
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
 msgid "%s private _key"
 msgstr "Privat _nyckel för %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:378
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, c-format
 msgid "%s key _password"
 msgstr "Nyckel_lösenord för %s"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "Välj %s-certifikat"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
 msgid "%s _certificate"
 msgstr "%s-_certifikat"
 
-#: ../src/libnma/nma-mobile-wizard.c:281
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Mitt land är inte listat"
+
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Inte listad"
 
-#: ../src/libnma/nma-mobile-wizard.c:465
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Min betalningstyp är inte listad…"
 
-#: ../src/libnma/nma-mobile-wizard.c:626
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Leverantör"
 
-#: ../src/libnma/nma-mobile-wizard.c:908
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Land eller region"
-
-#: ../src/libnma/nma-mobile-wizard.c:918
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Mitt land är inte listat"
-
-#: ../src/libnma/nma-mobile-wizard.c:999
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installerad GSM-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1002
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installerad CDMA-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1208
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Valfri enhet"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbandsanslutning"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4233,88 +4265,69 @@ msgstr ""
 "Denna guide hjälper dig att enkelt konfigurera en mobil bredbandsanslutning "
 "till ett mobilt (3G) nätverk."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du behöver följande information:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "Namnet på din bredbandsleverantör"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Namnet på betalningstypen för ditt bredband"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(i vissa fall) APN för din betalningstyp (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Skapa en anslutning för _denna mobila bredbandsenhet:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Konfigurera en mobil bredbandsanslutning"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Lista över länder eller regioner:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Land eller region"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Välj land eller region för din leverantör"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Välj din leverantör från en _lista:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-msgid "I can’t find my provider and I wish to enter it _manually:"
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Min leverantör använder GSM-tekniken (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Min leverantör använder CDMA-tekniken (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Leverantör:"
-
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Välj din leverantör"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Välj din betalningstyp:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN för vald betalningstyp (Access Point Name):"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:19
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4327,38 +4340,32 @@ msgstr ""
 "Om du är osäker på din betalningstyp så bör du fråga din leverantör efter "
 "korrekt APN för din betalningstyp."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Välj din betalningstyp"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 "Din mobila bredbandsanslutning är konfigurerad med följande inställningar:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Din enhet:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Din leverantör:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Din betalningstyp:"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4372,149 +4379,140 @@ msgstr ""
 "igen.  För att ändra dina inställningar för din mobila bredbandsanslutning, "
 "välj ”Nätverksanslutningar” från menyn System →  Inställningar."
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:28
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekräfta inställningar för mobilt bredband"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "Nyckel i %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "Certifikat i %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "Välj"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "Välj från fil…"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "Välj ett %s-certifikat"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, c-format
 msgid "%s certificate _password"
 msgstr "%s-certifikats_lösenord"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "Fel vid inloggning: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "Fel vid öppnande av en session: "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "_Upplåsningstoken"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "Utfärdat av"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "Ange %s-PIN"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "_Logga in"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Kom ihåg PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Lagra lösenordet bara för denna användare"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Lagra lösenordet för alla användare"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Fråga efter detta lösenord varje gång"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Lösenordet krävs inte"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "Visa _lösenord"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "_Tertiärt lösenord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundärt lösenord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Klicka för att ansluta"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-"Antingen saknas ett lösenord eller så är anslutningen ogiltig. I det senare "
-"fallet måste du redigera anslutningen med nm-connection-editor först"
-
-#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "Ny…"
 
-#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1066 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4522,35 +4520,35 @@ msgstr ""
 "Lösenord eller krypteringsnycklar krävs för att komma åt det trådlösa "
 "nätverket ”%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering krävs för det trådlösa nätverket"
 
-#: ../src/libnma/nma-wifi-dialog.c:1149 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering krävs för det trådlösa nätverket"
 
-#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1156 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Nytt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Ange ett namn för det trådlösa nätverket som du vill skapa."
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Anslut till dolt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Dolt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4558,35 +4556,51 @@ msgstr ""
 "Ange namn och säkerhetsuppgifter för det dolda trådlösa nätverket som du "
 "vill ansluta till."
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 msgid "Wi-Fi _security"
 msgstr "Trådlös _säkerhet"
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 msgid "C_onnection"
 msgstr "Ans_lutning"
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 msgid "Wi-Fi _adapter"
 msgstr "Trådlös _adapter"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Leverantör:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Lista över länder eller regioner:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Land eller region"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Trådbundet"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC-nätverk"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4596,33 +4610,41 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+"Antingen saknas ett lösenord eller så är anslutningen ogiltig. I det senare "
+"fallet måste du redigera anslutningen med nm-connection-editor först"
+
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Trådlös _säkerhet:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "_Nätverksnamn:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "Ans_lutning:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Trådlös _adapter:"
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Användning:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4630,7 +4652,7 @@ msgstr ""
 "Detta program är en komponent i NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4638,320 +4660,336 @@ msgstr ""
 "Det är inte tänkt för interaktion via kommandoraden utan körs istället i "
 "skrivbordsmiljön GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "inte aktiverad"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "inte registrerad"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hemnätverk (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Hemnätverk"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "söker"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nekad"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming-nätverk (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Roaming-nätverk"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "PIN-kod för SIM-kortet ”%s” på ”%s”"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN-kod krävs"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kod behövs för den mobila bredbandsenheten"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Mobila bredbandsanslutningen ”%s” är aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s-anslutning"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM-certifikat (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, eller PKCS#12 privata nycklar (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "odefinierat fel i 802.1X-säkerhet (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "inget CA-certifikat valt"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "vald CA-certifikatfil existerar inte"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "saknar PAC-fil för EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:267
-#: ../src/wireless-security/eap-method-peap.c:329
-#: ../src/wireless-security/eap-method-ttls.c:379
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "Välj en PAC-fil"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:416
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Autentiserad"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Båda"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 msgid "Anony_mous identity"
 msgstr "Anony_m identitet"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 msgid "PAC _file"
 msgstr "PAC-_fil"
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 msgid "_Inner authentication"
 msgstr "_Inre autentisering"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillåt automatisk PAC-pro_visionering"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "saknar EAP-LEAP-användarnamn"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "saknar EAP-LEAP-lösenord"
 
-#: ../src/wireless-security/eap-method-peap.c:314
-#: ../src/wireless-security/eap-method-ttls.c:364
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Version 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Inget CA-certifikat k_rävs"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 msgid "PEAP _version"
 msgstr "PEAP-_version"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "Suffix på servercertifikatets namn."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr "_Domän"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "saknar EAP-användarnamn"
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "saknar EAP-lösenord"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bitars lösenfras"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Visa _lösenord"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "saknar EAP-TLS-identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "inget användarcertifikat valt"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "vald användarcertifikatfil existerar inte"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "ingen nyckel vald"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "vald nyckelfil existerar inte"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 msgid "I_dentity"
 msgstr "I_dentitet"
 
-#: ../src/wireless-security/eap-method-ttls.c:333
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ingen EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "Okänt fel vid validering av 802.1X-säkerhet"
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunnlad TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 msgid "Au_thentication"
 msgstr "Au_tentisering"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "saknar leap-användarnamn"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "saknar leap-lösenord"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "saknar wep-nyckel"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 "ogiltig wep-nyckel: nyckel med en längd på %zu får endast innehålla "
 "hexadecimala siffror"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -4959,7 +4997,7 @@ msgstr ""
 "ogiltig wep-nyckel: nyckel med en längd på %zu får endast innehålla ascii-"
 "tecken"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4968,39 +5006,39 @@ msgstr ""
 "ogiltig wep-nyckel: felaktig nyckellängd %zu. En nyckel måste ha antingen "
 "längden 5/13 (ascii) eller 10/26 (hex)"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "ogiltig wep-nyckel: lösenfras får inte vara tom"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ogiltig wep-nyckel: lösenfras måste vara kortare än 64 tecken"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Öppet system"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Delad nyckel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (Standard)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 msgid "_Key"
 msgstr "_Nyckel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Vis_a nyckel"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 msgid "WEP inde_x"
 msgstr "WEP-inde_x"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5009,14 +5047,23 @@ msgstr ""
 "ogiltig wpa-psk: ogiltig nyckellängd %zu. Måste vara [8,63] byte eller 64 "
 "hexadecimala siffror"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "ogiltig wpa-psk: kan inte tolka nyckel med 64 byte som hexadecimal"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 msgid "_Type"
 msgstr "_Typ"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (standard)"
+
+#~ msgid "Ignored"
+#~ msgstr "Ignorera"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Aktiva nätverksanslutningar"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr ""
 #~ "Misslyckades med att uppdatera anslutningens hemligheter på grund av ett "
diff --git a/po/ta.po b/po/ta.po
index 8634c0c2..83b8b1fb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,8 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master.ta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-02-27 13:19+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -29,50 +30,59 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "பிணையம்"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "உங்களது பிணையத்தின் இணைப்புகளை மேலாண்மை செய்க"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "பிணைய இணைப்புகள்"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "உங்களின் பிணைய இணைப்பு அமைவுகளை மேலாண்மை மற்றும் மாற்றவும்"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "Set this to TRUE to disable notifications when connecting to a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "செயல்படுத்தாத இணைக்கப்படாத அறிவிப்புகள்"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Set this to TRUE to disable notifications when disconnecting from a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -80,11 +90,11 @@ msgid ""
 msgstr ""
 "Set this to TRUE to disable notifications when disconnecting from a network."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "கிடைக்கக்கூடிய அறிவிப்புகளின் பிணையத்தை குறைக்கிறது"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
@@ -92,20 +102,21 @@ msgstr ""
 "Set this to TRUE to disable notifications when wireless networks are "
 "available."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "முத்திரை"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Used to determine whether settings should be migrated to a new version."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "செயல்நீக்க Wi-Fiஐ உருவாக்கு"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -113,162 +124,175 @@ msgstr ""
 "அப்லெட்டைப் பயன்படுத்தும் போது சரி என்பதற்கு செயல்நீக்க உருவாக்கமான  adhoc பிணையங்களை "
 "அமைக்கவும்."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "CA சான்றிதழை தேர்ந்தெடுக்கவும்"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "பிணைய மேலாளர்"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "பிணைய இணைப்பு இல்லை"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "பிணைய மேலாளர் அப்லெட்"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "ஒயர்டு 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "இணை (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "பிணைய பெயர் (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "தற்காலிக"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "பான் (PAN) இணைப்பை உருவாக்க முடியவில்லை: %s"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "தெரியாத"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "துணைடிக்கப்பட்டது"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "துண்டிக்கபட்டது"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "இந்த செய்தியை மீண்டும் காட்டாதே"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' துண்டிக்கப்பட்டது ஏனெனில் பிணைய இணைப்பில் தடங்கல் ஏற்பட்டது."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் பிணைய இணைப்பு தடங்கல் செய்கிறது."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +321,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை எதிர்பாரமல் நிறுத்தப்பட்டது."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -326,7 +350,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை நேரத்திற்கு துவக்கவில்லை."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -335,7 +359,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை துவக்கவில்லை."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -344,7 +368,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் அங்கே சரியான VPNரகசியங்கள் இல்லை.."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -353,7 +377,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் தவறான VPN ரகசியங்கள்."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -362,7 +386,7 @@ msgstr ""
 "\n"
 "VPN இணைப்பு '%s' தோல்வியுற்றது."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -370,19 +394,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN உட்புகும் செய்தி"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN இணைப்பு தோல்வியுற்றது"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -395,7 +419,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -408,575 +432,600 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "சாதனம் தயாராக இல்லை (தளநிரல் இல்லை)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "சாதனம் தயாராக இல்லை"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "துணைடிக்கப்பட்டது"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "துண்டி"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "சாதனம் மேலாண்மை செய்யப்படவில்லை"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "பிணைய சாதனம் கிடைக்கப்பெறவில்லை"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN இணைப்புகள்"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr " VPNஐ கட்டமைக்கவும் (_C)..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN இணைப்புகள்"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "பிணைய மேலாளர் இயக்கத்தில் இல்லை..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "பிணைய செயல்நீக்கப்பட்டது"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "பிணையம் செயல்படுகிறது (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "ஒயர்லெஸ் செயல்படுகிறது (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "மொபைல் பிராட்பேண்டை செயற்படுத்தவும் (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "அறிவிப்புகளை செயற்படுத்தவும் (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "இணைப்பு தகவல் (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "இணைப்புகளை திருத்தவும்..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "பற்றி (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "நீங்கள் இப்போது '%s'உடன் இணைப்படுகிறார்கள்."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "துண்டிக்கபட்டது"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "பிணைய இணைப்பு துண்டிக்கப்படும்."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "பிணைய இணைப்பு '%s' தயாராகிறது..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "பிணைய இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "ஒரு பிணைய முகவரி '%s'காக தேவைப்படுகிறது..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "பிணைய இணைப்பு '%s' செயல்படுகிறது"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN இணைப்பு '%s'துவங்குகிறது..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s'காக ஒரு VPN முகவரி தேவைப்படுகிறது..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN இணைப்பு '%s' செயல்படுகிறது"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "பிணைய இணைப்பு இல்லை"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "பிணைய மேலாளர் அப்லெட்"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "தவறான PUK குறியீடு; உங்கள் வழங்கியை தொடர்பு கொள்ளவும்."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "தவறான PIN குறியீடு; உங்கள் வழங்கியை தொடர்பு கொள்ளவும்."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "பூட்டுநீக்கிய குறியீட்டை அனுப்புகிறது..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "மொபைல் பிராட்பேண்டு (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "மொபைல் பிராட்பேண்டு"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "கிடைக்கக்கூடி"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "இணைப்பு ஸ்தாபிக்கப்படுகிறது"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "இப்போது மொபைல் ப்ராட்பேண்ட் பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "மொபைல் பிராட்பேண்டு பிணையத்தின் கடவுச்சொல்"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "இப்போது நீங்கள் வீட்டு வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "இப்போது நீங்கள்  அலையும் வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "இப்போது மொபைல் ப்ராட்பேண்ட் பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Preparing mobile broadband connection '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "கட்டமைக்கப்பட்ட மொபைல் பிராட்பேண்டுஇணைப்பு '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "'%s'ன் மொபைல் பிராட்பேண்டு இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "தானியக்கி ஈதர்நெட்"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ஒயர்டு பிணையங்கள் (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ஒயர்டு பிணையம் (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "ஒயர்டு பிணையங்கள்"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "ஒயர்டு பிணையம்"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "இப்போது ஒயர்டு பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ஒயர்டு பிணைய இணைப்பிற்கு '%s' தயாராகிறது..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "கட்டமைக்கப்பட்ட ஒயர்டு பிணைய இணைப்பு '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "'%s'ன் ஒயர்டு பிணைய இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s'காக ஒரு ஒயர்டு பிணைய முகவரி தேவைப்படுகிறது..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ஒயர்டு பிணைய இணைப்பு '%s' செயலிபடுகிறது"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL அங்கீகாரம்"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ஒன்றுமில்லை)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "புதிய இணைப்பை திருத்த முடியவில்லை"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "ஒயர்டு பிணையங்கள் (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "ஒயர்டு பிணையம் (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "ஒயர்டு பிணையம்"
 msgstr[1] "ஒயர்டு பிணையம்"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "வைமாக்ஸ்  ஐ செயல்நீக்கு"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "வன்பொருள் மாற்றியால் வைமாக்ஸ் செயல்நீக்கப்பட்டது"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "நிறைய பிணையங்கள்"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "ஒயர்லெஸ் பிணையங்கள் இருக்கிறது"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ஒரு ஒயர்லெஸ் பிணையத்தை இணைப்பதற்கு இந்த பிணைய பட்டியை பயன்படுத்துக"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "இப்போது நீங்கள் Wi-Fi பிணையம் '%s' உடன் இணைக்கப்பட்டுள்ளீர்கள்."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "பிணைய இணைப்பு '%s' தயாராகிறது..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "கட்டமைக்கப்பட்ட ஒயர்டு பிணைய இணைப்பு '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "'%s'ன் ஒயர்லெஸ் பிணைய இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "ஒரு பிணைய முகவரி '%s'காக தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "ஒயர்லெஸ் பிணைய இணைப்பு '%s' செயல்படுகிறது: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "ஒயர்டு பிணைய இணைப்பு '%s' செயலிபடுகிறது"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "பான் (PAN) இணைப்பை உருவாக்க முடியவில்லை: %s"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "பிழை காட்டும் இணைப்பு தகவல்:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "மாறும்           WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "முகவரிகள்"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "1 (முன்னிருப்பு)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "தெரியாத"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP முகவரி"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ஒளிப்பரப்பு முகவரி"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "துணை இணைய மறைப்பு"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "முதன்மை DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "இரண்டாவது DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "மூன்றாவது DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ஈதர்நெட் (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "பொதுவான"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "முகப்பு"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "வன்பொருள் முகவரி"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "இயக்கி"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "வேகம்"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "பாதுகாப்பு:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "ஐபிவி4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "முன்னிருப்பு வழி"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "ஐபிவி 6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "உதாசீனம் செய்யப்பட்டது"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "கடவுச்சொல்:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "விபிஎன் வகை"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "விபிஎன் நுழைவாயில்"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "விபிஎன் பயனர் பெயர்"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "விபிஎன் அறிவிப்பு பலகை"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "அடிப்படை இணைப்பு"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "தெரியாத"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "சரியான செயல்பாட்டிலுள்ள இணைப்புகள் காணப்படுவில்லை!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -984,16 +1033,20 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "மேலும் பல சமுதாய பங்களிப்பாளர்கள் மொழி பெயர்ப்பாளர்கள்"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "உங்கள் பிணைய சாதனங்கள் மற்றும் இணைப்புகளை நிர்வகிக்கும் அறிவிப்பு பகுதி ஆப்லெட்"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "பிணைய மேலாளர் இணையத்தளம்"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "மொழிபெயர்ப்பாளர்-சன்மானம்"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -1001,33 +1054,33 @@ msgstr ""
 "பிணைய மேலாளர் அப்லெட் தேவையான மூலங்களைக் கண்டு பிடிக்க முடியவில்லை. (.ui கோப்பு "
 "காணப்படவில்லை)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "விடிபட்ட மூலங்கள்"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "மொபைல் பிராட்பேண்டு பிணையத்தின் கடவுச்சொல்"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'ஐ இணைப்பதற்கு ஒரு கடவுச்சொல் தேவைப்படுகிறது."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1037,25 +1090,25 @@ msgstr ""
 "தேவைப்படுகிறது."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN குறியீடு:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN குறியீடு காட்டவும்"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK பூட்டைநீக்க தேவைப்படுகிறது"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK பூட்டுநீக்க தேவைப்படுகிறது"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1065,35 +1118,42 @@ msgstr ""
 "தேவைப்படுகிறது."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK குறியீடு:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "புதிய PIN குறியீடு:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "புதிய PIN குறியீட்டை மீண்டும்-உள்ளிடவும்:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "இணைப்பு தகவல்"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "டன் (DUN) இணைப்பை உருவாக்க முடியவில்லை: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1102,41 +1162,41 @@ msgstr ""
 "IP பிணையத்தில் உங்களது கணினி முகவரிகள் அடையாளம்.  \"Add\" பட்டனுடன் சேர்த்துஒரு IP "
 "முகவரியை கிளிக் செய்யவும்."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_D அழி"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "தானாக ஏற்படும் வழிகளிலிருந்து புறக்கணிக்கவும் (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_U மூலங்களின் பிணையத்திற்கு மட்டும் இந்த இணைப்பை பயன்படுத்தவும் "
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1144,17 +1204,17 @@ msgstr ""
 "பெறமுடிந்தால், முன்னிருப்பு பிணைய இணைப்புக்கு இந்த இணைப்பை ஒருபோதும்  பயன்படுத்த "
 "முடியாது."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "உருவாக்கு..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1166,85 +1226,100 @@ msgstr ""
 "உருவாக்க விரும்பும் VPN இணைப்பு வகை பட்டியலில் தெரியவில்லை எனில், நீங்கள் சரியான VPN "
 "சொருகியை நிறுவவில்லை."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "சேவை (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "ரவுன்ட்-ராபின்"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "செயல்மிகு மறுபிரதி"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ஒளிப்பரப்பு"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "சரிசெய்துகொள்ளும் பரப்பல் சுமை சமநிலைப்படுத்தல்"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "சரிசெய்துகொள்ளும் சுமை சமநிலைப்படுத்தல்"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (பரிந்துரைக்கப்படுவது)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "பிணைப்பு இணைப்புகள் (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "முறைமை (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_E திருத்து"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "கண்காணிப்பு இடைவேளை (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "இடைமுகப் பெயர் (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "இணைப்பு கண்காணிப்பு (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP இலக்குகள் (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1252,125 +1327,178 @@ msgstr ""
 "இணைப்பு நிலையைச் சோதிக்கும் போது தேடிப்பார்க்க வேண்டிய ஒரு IP முகவரி அல்லது "
 "காற்புள்ளிகளால் பிரித்த IP முகவரிகளின் பட்டியல்."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "இணைப்பு செயல்நிலை தாமதம் (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "இணைப்பு செயலிலா நிலை தாமதம் (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "முதன்மை DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "பைட்டுகள்"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "அடிப்படை இணைப்பு:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "இணைப்பு செயலிலா நிலை தாமதம் (_d):"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "பிணையம் செயல்படுகிறது (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "தானாக"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "முன்னிருப்பு"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1381,437 +1509,530 @@ msgstr ""
 "பயன்படுத்தப்படும். இந்த நடத்தை மாக் க்ளொனிங் அல்லது ஸ்பூஃபிங் எனபப்டும். எ-கா: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "முகவரி"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "முகவரி"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "வன்பொருள் முகவரி:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ஏதாவது சாதனம்"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "தெரியாத பிழையால் இணைப்பு ரகசியங்களை மேம்படுத்த முடியவில்லை."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "இந்த இணைப்புக்காக 802.1_X பாதுகாப்பை பயன்படுத்துக"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "பயனர் பெயர் (_U) "
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "சேவை (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "கடவுச்சொல்லைக் காட்டு (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "கடவுச்சொல் (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "முகப்பு"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "தாய் இடைமுகம் (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "தாய் இடைமுகம் (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "தானாக"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "திருப்பிய ஜோடி (டிபி)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "இணைப்பு பொருள் இடைமுகம் (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "பிஎன்சி (BNC)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "ஊடக சார்பில்லா இடைமுகம் (எம்ஐஐ)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "தவிர்"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "கைமுறை"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "துறை (_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "சேவை (_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_l நகல் மேக்(MAC) முகவரி:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "முன்னிருப்பு"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "தவிர்"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ஒளிப்பரப்பு முகவரி:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "வேகம் (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "முழு இரட்டை (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "ஒன்றுமில்லை"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "இப்போது ஒயர்டு பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "தானியங்கியாக இந்த சாதனத்தை பூட்டு திறக்கவும்"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "இணைப்பு தகவல் (_I)"
+msgid "_Metered connection"
+msgstr "அடிப்படை இணைப்பு:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "தானாக இணைக்கவும் (_a)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1820,7 +2041,7 @@ msgstr ""
 "IP பிணையத்தில் உங்களது கணினி முகவரிகள் அடையாளம்.  \"Add\" பட்டனுடன் சேர்த்துஒரு IP "
 "முகவரியை கிளிக் செய்யவும்."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1828,127 +2049,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "தானியக்கி முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "முகவரிகள்"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "டிரான்ஸ்போர்ட் முறை (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "தரவுப்படம்"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "இணைக்கப்பட்டது"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "டிரான்ஸ்போர்ட் முறை (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "சாதன பெயர் + எண்"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ஈதர்நெட் (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "தானியங்கி கைமுறை டிஎன்எஸ் அமைப்புகளுடன் "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "இணைப்பு-உள்ளமை "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "மற்ற கணினிகள்ளுடன் பகிரப்பட்டது"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "முறை (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1958,8 +2183,8 @@ msgstr ""
 "இந்த DHCP கிளையன் அடையாளப்படுத்தி ஒரு பிணைய நிர்வாகியை தனிபயனாக்க அனுமதிக்கிறது. "
 "நீங்கள் ஒரு DHCP கிளையன் அடையாளப்படுத்தியை இங்கே உள்ளிட பயன்படுத்தவும்."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1967,25 +2192,26 @@ msgstr ""
 "புரவலன் பெயர்களை தீர்க்கும் போது பயன்படுத்தப்பட்ட டொமைன்கள். பல டொமைன்களை அரைப்புள்ளியால் "
 "பிரிக்கவும்."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP கிளையன்ட் குறியீடு:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_e செயற்களத்தை தேடவும்"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS சேவையகங்கள்:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1993,11 +2219,11 @@ msgstr ""
 "புரவலன் பெயர்களை தீர்க்க ஐபி முகவரிகள் பயன்படுத்தப்பட்டுள்ளது. பல டொமைன்களின் பெயர் சேவையக "
 "முகவரிகளை அரைப்புள்ளியால் பிரிக்கவும்."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "இந்த இணைப்பை முழுமையாக்க IPv4 முகவரி தேவை"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2005,25 +2231,34 @@ msgstr ""
 "IPv4 கட்டமைப்பு தோல்வியடைந்து ஆனால் IPv6 வெற்றியடைந்தால், IPv6-திறன் நெட்வொர்க்குடன் "
 "இணைக்கும் போது இணைப்பை முடிக்க அனுமதிக்கிறது."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "வழிகள் (_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "செயல்நீக்கப்பட்டது"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2033,15 +2268,19 @@ msgstr ""
 "புரவலன் பெயர்களை தீர்க்க ஐபி முகவரிகள் பயன்படுத்தப்பட்டுள்ளது. பல டொமைன்களின் பெயர் சேவையக "
 "முகவரிகளை அரைப்புள்ளியால் பிரிக்கவும்."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "இந்த இணைப்பை முழுமையாக்க IPv6 முகவரி தேவை"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2049,752 +2288,859 @@ msgstr ""
 "IPv6 கட்டமைப்பு தோல்வியடைந்து ஆனால் IPv4 கட்டமைப்பு வெற்றியடைந்தால், IPv4-திறன் "
 "நெட்வொர்க்குடன் இணைக்கும் போது, இணைப்பை முடிக்க அனுமதிக்கிறது."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "மெட்ரிக்"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "இறக்குமதி (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "அடிப்படை"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "எண் (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "மேம்பட்ட"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "பிணையம் ID (_e) :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "மாற்று..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "_r இல்ல பிணையம் கிடைக்கவில்லையெனில் ரோமிங்கை அனுமதிக்கவும்"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "அங்கீகாரம்"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "அனுமதிக்கப்பட்ட முறைகள்:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "முறைகள் கட்டமைக்கப்பட்டது (_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "சுருக்கம்"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "பாயிண்ட் டு பாயிண்ட் மறைகுறியாக்கத்தை பயன்படுத்து (_U) (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-பிட் மறைகுறியாக்கம் தேவைப்படுகிறது (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "நிலையான MPPE பயன்படுத்தவும் (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD தரவு அழுத்தம் அனுமதிக்கிறது"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate தரவு குறுக்கத்தை அனுமதி"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP தலைப்பு அழுத்தத்தை பயன்படுத்து (_h)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "எதிரொலி"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP எகோ பாக்கெட்டுகளை அனுப்பு (_e)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "முறை (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "முறை (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "மேம்பட்ட"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ஒயர்டு பிணையங்கள்"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_e பாதுகாப்பு:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "தனிப்பட்ட விசை ( _k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "இணைப்பு செயல்நிலை தாமதம் (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "இணைப்பு செயலிலா நிலை தாமதம் (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "தாய் இடைமுகம் (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP இலக்குகள் (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP இலக்குகள் (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ஈதர்நெட் (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "அடிப்படை இணைப்பு:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "தானியக்கி ஈதர்நெட்"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "ஐபிவி4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "வன்பொருள் முகவரி:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "வன்பொருள் முகவரி:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "மாற்றப்படும் பவர் (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "மாற்றப்படும் பவர் (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "தாய் இடைமுகம் (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "இடைமுகப் பெயர் (_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_l நகல் மேக்(MAC) முகவரி:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "சாதன பெயர் + எண்"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + எண்"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "தற்காலிக"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "மாற்றப்படும் பவர் (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "விகிதம்: (_R)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "சேனல் (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "பிணைப்பு (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "அனுமதிக்கப்பட்டஅங்கீகார முறைகள் "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "கடவுச்சொல் அங்கீகார நெறிமுறை"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 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
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2803,443 +3149,481 @@ msgstr ""
 "பல சமயங்களில், வழங்குபவர் PPP சேவையகங்கள் எல்லா அங்கீகார முறைகளுக்கும் துணைபுரியும்.  "
 "இணைப்பு தோல்வியுற்றால், சில முறைகளுக்காவது துணையை நீக்கி முயற்சிக்கவும்."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "இன்ஃபினிபேன்ட்"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "பிணைப்பு"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "பிரிட்ஜ்"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN கூடுதல் இணைப்பை சரியாக VPN இணைப்பை இறக்க முடியவில்லை\n"
-"\n"
-"பிழை: VPN சேவை வகை இல்லை."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN இணைப்பை இறக்க முடியவில்லை"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"கோப்பு '%s'ஐ வாசிக்க முடியவில்லை அல்லது அங்கீகரிக்கப்பட்ட VPN இணைப்புத் தகவலை "
-"பெற்றிருக்கவில்லை \n"
+"VPN கூடுதல் இணைப்பை சரியாக VPN இணைப்பை இறக்க முடியவில்லை\n"
 "\n"
-"பிழை: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "தெரியாத"
+"பிழை: VPN சேவை வகை இல்லை."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "இறக்க கோப்பை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "வன்பொருள்"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "மெய்நிகர்"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "சேமிக்கப்பட்ட ஒரு VPN அமைவாக்கத்தை இறக்கு..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "தெரியாத பிழையால் இணைப்பு எடிட்டர் உரையாடலை நிறுவ முடியவில்லை."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "புதிய இணைப்பை உருவாக்க முடியவில்லை"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "இணைப்பை அழிக்க முடியவில்லை"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr " %s இணைப்பை அழிக்க நீங்கள் விரும்புகிறீர்களா?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN இணைப்புகள்"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "முகவரி"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "நெட்மாஸ்க்"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "நுழைவாயில்"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "மெட்ரிக்"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "முன்பொருத்தம்"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "%sஐ திருத்துகிறது"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "பெயரிடப்படாத இணைப்பை திருத்துகிறது"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "இணைப்பு பெயர் (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "பிழையை நிறுவும் எடிட்டர்"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "இணைப்பு எடிட்டர் தேவையான மூலங்களை கண்டுபிடிக்க முடியவில்லை (.ui கோப்பு காணப்படவில்லை)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_S சேமிக்கவும்"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "இந்த இணைப்புக்கு செய்த மாற்றங்களை சேமிக்கவும்."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "இந்த கணினியில் அனைத்து பயனர்கள் இணைப்பையும் சேமிக்க அங்கீகரிக்கவும்."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "இணைப்பை திருத்த முடியவில்லை"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "இணைப்புத் திருத்தி உரையாடலை உருவாக்குவதில் அறியாத பிழை ஏற்பட்டது."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "பிழையை நிறுவும் எடிட்டர்"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "இணைப்பு பெயர் (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "ஏற்றுமதி... (_E)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "லேபில்"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "லேபில்"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "இல்லை"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "இப்போது"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d நிமிடம் முன்"
 msgstr[1] "%d நிமிடங்களுக்கு முன்"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d மணி முன்"
 msgstr[1] "%d மணி முன்"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d நாள் முன்"
 msgstr[1] "%d நாள் முன்"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d மாதம் முன்"
 msgstr[1] "%d மாதம் முன்"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d வருடத்திற்கு முன்"
 msgstr[1] "%d வருடங்களுக்கு முன்"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "இணைப்பை சேர்க்க முடியவில்லை"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "பெயர்"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "கடைசியில் பயன்படுத்தப்பட்டது"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்தவும்"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்த அங்கீகாரம்"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்கவும்"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்க அங்கீகாரம்"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "துணைபுரியாத மொபைல் பிராட்பேண்டை இணைப்பு வகை. முடியவில்லை."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "'%s' இணைப்பை உருவாக்குவது எப்படி என்று தெரியவில்லை"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "இணைப்பை திருத்தும்போது பிழை"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "இணைப்பை உருவாக்குவதில் பிழை."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "இணைப்பை சேர்க்க முடியவில்லை"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' இணைப்பை உருவாக்குவது எப்படி என்று தெரியவில்லை"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "இணைப்பை திருத்தும்போது பிழை"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr " UUID '%s' உடன் இணைப்பை காணவில்லை."
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "பிணைய இணைப்புகள்"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN இணைப்புகள்"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X பாதுகாப்பு"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Wi-Fi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "இந்த இணைப்புக்காக 802.1_X பாதுகாப்பை பயன்படுத்துக"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ஃப்ளூடூத் சாதனத்தை தேட முடியவில்லை."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "பிணையம் செயல்படுகிறது (_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "பிணைப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "முதன்மை DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "பிணைப்பு இணைப்பு %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
@@ -3247,34 +3631,39 @@ msgstr "ஒயர்டு இணைப்பு %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "தாய் இடைமுகம் (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL இணைப்பு %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3284,57 +3673,56 @@ msgstr ""
 "இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
 "பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "உதாசீனம் செய்யப்பட்டது"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ஈதர்நெட் (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_l நகல் மேக்(MAC) முகவரி:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "முன்னிருப்பு"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3345,185 +3733,187 @@ msgstr ""
 "இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
 "பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "இன்ஃபினிபேன்ட் பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "இன்ஃபினிபேன்ட் இணைப்பு %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "தானாக (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "தானியக்கி (VPN) முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "தானியக்கி முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "தானாக (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "தானியக்கி (PPPoE) முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "தானாக (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "தானியக்கி (DHCP) முகவரிகள் மட்டுமே "
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "இணைப்பு-உள்ளமை மட்டும்"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_DNS சேவையகங்கள்:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_e செயற்களத்தை தேடவும்"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4 வழிகள் %sகாக திருத்துகிறது"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 அமைவுகள்"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "தானாக, (DHCP) மட்டும்"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6 வழிகள் %sகாக திருத்துகிறது"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 அமைவுகள்"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL இணைப்பு %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s ஸ்லேவ் %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "மொபைல் பிராட்பேண்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "துணைபுரியாத மொபைல் பிராட்பேண்டை இணைப்பு வகை. முடியவில்லை."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "மொபைல் பிராட்பேண்டு வழங்குபவர் வகையை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3532,7 +3922,7 @@ msgstr ""
 "உங்கள் வழங்குபவர் பயன்படுத்தும் டெக்னாலஜியை உங்களது பிராட்பேண்டு மொபைலுக்கு "
 "தேர்ந்தெடுக்கவும்.உங்களுக்கு தெரியவில்லை என்றால், அவரைக் கேட்டவும்."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "எனது வழங்குபவர் _GSM-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. GPRS, EDGE, "
@@ -3540,85 +3930,81 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "எனது வழங்குபவர் C_DMA-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "ஜிஎஸ்எம்(GSM)"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "PPP அங்கீகாரம் முறைகள் %sகாக திருத்தப்படுகிறது"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP அமைவுகள்"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "பிணைப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
@@ -3626,11 +4012,11 @@ msgstr "ஒயர்டு இணைப்பு %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
@@ -3638,59 +4024,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "பிணைய இணைப்பு இல்லை"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "IPv4 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN இணைப்பு %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "VPN கூடுதல் இணைப்பு சேவை '%s'காக தேட முடியவில்லை."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "VPN கூடுதல் இணைப்பு சேவை '%s'காக தேட முடியவில்லை."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "VPN கூடுதல் இணைப்பு சேவை '%s'காக தேட முடியவில்லை."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN இணைப்பு %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3701,7 +4087,7 @@ msgstr ""
 "உருவாக்க விரும்பும் VPN இணைப்பு வகை பட்டியலில் தெரியவில்லை எனில், நீங்கள் சரியான VPN "
 "சொருகியை நிறுவவில்லை."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3710,7 +4096,7 @@ msgstr ""
 "இந்த விருப்பம் இந்த இணைப்பை வயர்லெஸ் அணுகல் புள்ளி (AP) இங்கே உள்ளிடப்பட்ட BSSIDயுடன்  "
 "பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3720,98 +4106,96 @@ msgstr ""
 "இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
 "பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ஏதாவது சாதனம்"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ஒயர்டு இணைப்பு %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-பிட் விசை (ஹெக்ஸ் அல்லது ஆஸ்கி)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-பிட் கடவுச்சொல்"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "மாறும் WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 கடவுச்சொல்"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Wi-Fi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை; விடுபட்ட Wi-Fi அமைவுகள்."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "ஒயர்லெஸ் பாதுகாப்பு"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" என பெயரிடப்பட்ட கோப்பு ஏற்கனவே உள்ளது."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "மாற்று (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "VPN இணைப்புடன் %s ஐ இடமாற்ற நீங்கள் விரும்புகிறீர்களா?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN இணைப்பை ஏற்ற முடியவல்லை"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3822,223 +4206,106 @@ msgstr ""
 "\n"
 "பிழை: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN இணைப்பை ஏற்றவும்..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "பூட்டுநீக்கு (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "தானியங்கியாக இந்த சாதனத்தை பூட்டு திறக்கவும்"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "இணைப்பு தகவல்"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "தனிப்பட்ட விசை ( _k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "பயனர் சான்றிதழ் (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "பின்வரும் அமைவுகள் உங்கள் மொபைல் பிராட்பேண்டு இணைப்பு கட்டமைக்கப்படுகிறது:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "உங்கள் சாதனம்:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "உங்கள் வழங்குபவர்:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "உங்கள் திட்டம்:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-" 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."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "பட்டியலிடப்படாத"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "உங்கள் திட்டத்தை தேர்ந்தெடுக்கவும் (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "தேர்ந்தெடுக்கப்பட்ட திட்டம் _APN (Access Point Name):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"எச்சரிக்கை: ஒரு தவறான திட்டத்தை தேர்ந்தெடுப்பது உங்கள் ப்ராட்பேண்ட் கணக்கில் தவறான பில்லை "
-"கொடுக்கலாம் அல்லது இணைப்பை துண்டிக்கலாம்.\n"
-"\n"
-"உங்கள் திட்டத்தை பற்றி எதுவும் தெரியவில்லையெனில் உங்கள் திட்டத்தின் APNஐ வழங்குநரிடம் "
-"கேட்கவும்."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "பில்லிங் திட்டத்தை தேர்ந்தெடுக்கவும்"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "எனது திட்டம் பட்டியலிடப்படவில்லை..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "ஒரு பட்டியலிருந்து உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும் (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "வழங்குபவர்"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr ""
-"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "வழங்குபவர்:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "எனது வழங்குபவர் GSM டெக்னாலஜியை பயன்படுத்துகிறார் (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "எனது வழங்குபவர் CDMA டெக்னாலஜியை பயன்படுத்துகிறார் (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும்"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "நாடு அல்லது மாநிலப் பட்டியல்:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "நாடு அல்லது மாநிலம் "
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "உங்களின் வழங்குபவரின் நாடு அல்லது மாநிலம் தேர்ந்தெடுக்கவும்"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM சாதனம் நிறுவப்பட்டது"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA சாதனம் நிறுவபட்டது"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ஏதாவது சாதனம்"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4046,192 +4313,272 @@ msgstr ""
 "ஒரு செல்லுலார் (3G) பிணையத்துடன் மொபைல் பிராட்பேண்டு இணைப்பைஅமைக்க உங்களுக்கு உதவியாளர் "
 "உதவிபுரிவார்."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "பின்வரும் தகவல் உங்களுக்கு தேவை:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "உங்கள் பிராட்பேண்டு வழங்குபவர்கள் பெயர்"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "உங்கள் பிராட்பேண்டு பில்லிங் திட்டப் பெயர்"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(ஒரு சில சமயங்களில்) உங்களது பிராட்பேண்டுபில்லிங் திட்டம் APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "இந்த மொபைல் பிராட்பேண்டு சாதன இணைப்பை உருவாக்கவும் (_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ஏதாவது சாதனம்"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "மொபைல் பிராட்பேண்டு இணைப்பை அமைக்கவும்"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "நாடு அல்லது மாநிலம் "
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "உங்களின் வழங்குபவரின் நாடு அல்லது மாநிலம் தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "ஒரு பட்டியலிருந்து உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும் (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "எனது வழங்குபவர் GSM டெக்னாலஜியை பயன்படுத்துகிறார் (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "எனது வழங்குபவர் CDMA டெக்னாலஜியை பயன்படுத்துகிறார் (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "உங்கள் திட்டத்தை தேர்ந்தெடுக்கவும் (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "தேர்ந்தெடுக்கப்பட்ட திட்டம் _APN (Access Point Name):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"எச்சரிக்கை: ஒரு தவறான திட்டத்தை தேர்ந்தெடுப்பது உங்கள் ப்ராட்பேண்ட் கணக்கில் தவறான பில்லை "
+"கொடுக்கலாம் அல்லது இணைப்பை துண்டிக்கலாம்.\n"
+"\n"
+"உங்கள் திட்டத்தை பற்றி எதுவும் தெரியவில்லையெனில் உங்கள் திட்டத்தின் APNஐ வழங்குநரிடம் "
+"கேட்கவும்."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "பில்லிங் திட்டத்தை தேர்ந்தெடுக்கவும்"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "பின்வரும் அமைவுகள் உங்கள் மொபைல் பிராட்பேண்டு இணைப்பு கட்டமைக்கப்படுகிறது:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "உங்கள் சாதனம்:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "உங்கள் வழங்குபவர்:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "உங்கள் திட்டம்:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+" 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."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ஒன்றுமில்லை)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A சான்றிதழ்:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "தெரியாத"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "ஒரு கோப்பினை தேர்ந்தெடு"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "பயனர் சான்றிதழ் (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "இணைப்பை திருத்தும்போது பிழை"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "பூட்டுநீக்கு (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "ஒவ்வொரு முறையும் இந்த கடவுச்சொல்லைக் கேட்கவும் (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s'ஐ இணைப்பதற்கு ஒரு கடவுச்சொல் தேவைப்படுகிறது."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "கடவுச்சொல் (_P):"
+msgid "Sh_ow passwords"
+msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "கடவுச்சொல் (_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
+msgid "_Secondary Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "கடவுச்சொல் (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "துண்டி"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "மாறும் WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "உருவாக்கு (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4239,42 +4586,42 @@ msgstr ""
 "கடவுச்சொல் அல்லது மறைகுறியாக்க விசைகள் ஒயர்லெஸ் பிணைய '%s'ஐ அணுகுவதற்கு "
 "தேவைப்படுகிறது."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ஒயர்லெஸ் பிணைய அங்கீகாரம் தேவைப்படுகிறது"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "அங்கீகார ஒயர்லெஸ் பிணையம் தேவைப்படுகிறது"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "புதிய ஒயர்லெஸ் பிணையம்"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ஒயர்லெஸ் பிணையத்தை உருவாக்க ஒரு பெயரை உள்ளிடவும்."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "மறைக்கட்ட ஒழர்லெஸ் பிணையம்"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4283,37 +4630,56 @@ msgstr ""
 "நீங்கள் இணைக்க விரும்பினால் மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்திற்கு பெயர் மற்றும்பாதுகாப்பு "
 "விவரங்களை உள்ளிடவும்."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "இணைப்பு (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "வழங்குபவர்:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "நாடு அல்லது மாநிலப் பட்டியல்:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "நாடு அல்லது மாநிலம் "
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "ஒயர்டு"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4323,17 +4689,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "பிணைய பெயர் (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "இணைப்பு (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "பயன்பாடு:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4341,7 +4731,7 @@ msgstr ""
 "இது NetworkManager இன் நிரல் ஆகும் (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4349,415 +4739,465 @@ msgstr ""
 "கட்டளை வரி கலந்துரையாடலுக்கு நோக்கமில்லை ஆனால் அதற்கு பதிலாக GNOME பணிமேடை சூழலை "
 "இயக்குகிறது."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "செயல்படுத்தப்படவில்லை"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "பதிவு செய்யப்படவில்லை"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "முகப்பு பிணையம் (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "இல்ல பிணையம்"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "தேடுகிறது"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "பதிவுசெய்தல் மறுக்கப்பட்டது"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ரோமிங்)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ரோமிங்)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ரோமிங் பிணையம் (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "ரோமிங் பிணையம்"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "சிம் கார்ட் '%s' ( '%s' இல்) க்கு PIN கோட்"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN குறியீடு தேவைப்படுகிறது"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN குறியீடு மொபைல் பிராட்பேண்டு சாதனத்திற்கு தேவைப்படுகிறது"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது : (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ரோமிங் "
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "அடிப்படை இணைப்பு:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER அல்லது PEM சான்றிதழ்கள் (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, or PKCS#12 தனிப்பட்ட விசைகள் (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ஒரு PAC கோப்பினை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC கோப்புகள் (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "எல்லா கோப்புகள்"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "பெயரில்லாத அடையாளம்"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "அங்கீகரித்த"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "இரண்டும்"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "பெயரில்லாத அடையாளம் (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC _ கோப்பு:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "_I உள் அங்கீகாரம்:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_v தானியங்கி PAC  ஏற்பாடு"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "அங்கீகார சான்றிதழைத் தேர்ந்தெடு..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "பதிப்பு 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "பதிப்பு 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A சான்றிதழ்:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_v PEAP பதிப்பு:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-பிட் கடவுச்சொல்"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "அடையாளம்(_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "பாதுகாக்கப்பட்ட EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_t அங்கீகாரம்:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (முன்னிருப்பு)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "திறந்த கணினி"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "பகிரப்பட்ட விசை"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (முன்னிருப்பு)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "விசை (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "விசையை காட்டு (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP அட்டவணை (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "வகை (_T):"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "1 (முன்னிருப்பு)"
+
+#~ msgid "Ignored"
+#~ msgstr "உதாசீனம் செய்யப்பட்டது"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "தெரியாத பிழையால் இணைப்பு ரகசியங்களை மேம்படுத்த முடியவில்லை."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "இணைப்பு தகவல் (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN இணைப்பை இறக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "கோப்பு '%s'ஐ வாசிக்க முடியவில்லை அல்லது அங்கீகரிக்கப்பட்ட VPN இணைப்புத் தகவலை "
+#~ "பெற்றிருக்கவில்லை \n"
+#~ "\n"
+#~ "பிழை: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "தெரியாத"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "அங்கீகார சான்றிதழைத் தேர்ந்தெடு..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A சான்றிதழ்:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "பிணைய மேலாளர்"
 
@@ -4793,15 +5233,6 @@ msgstr "வகை (_T):"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "தானாக மாற்றக்கூடிய (_o)"
 
@@ -4902,12 +5333,6 @@ msgstr "வகை (_T):"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "இரண்டாவது DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "மூன்றாவது DNS:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "_X வைமாக்ஸ் மொபைல் பிராட்பேண்டை செயற்படுத்தவும் "
 
@@ -4956,12 +5381,6 @@ msgstr "வகை (_T):"
 #~ msgid "A_vailable to all users"
 #~ msgstr "அனைத்து பயனர்களுக்கும் கிடைக்கப் பெறும"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "தானாக இணைக்கவும் (_a)"
-
-#~ msgid "_Import"
-#~ msgstr "இறக்குமதி (_I)"
-
 #~ msgid "Error saving connection"
 #~ msgstr "இணைப்பு சேமிக்கும் போது பிழை"
 
@@ -4995,9 +5414,6 @@ msgstr "வகை (_T):"
 #~ msgid "Error: %s"
 #~ msgstr "பிழை: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "டன் (DUN) இணைப்பை உருவாக்க முடியவில்லை: %s"
-
 #~ msgid "Mobile wizard was canceled"
 #~ msgstr "மொபைல் பார்வை ரத்துசெய்யப்பட்டது"
 
@@ -5094,9 +5510,6 @@ msgstr "வகை (_T):"
 #~ msgid "Unknown"
 #~ msgstr "தெரியாத"
 
-#~ msgid "translator-credits"
-#~ msgstr "மொழிபெயர்ப்பாளர்-சன்மானம்"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
diff --git a/po/te.po b/po/te.po
index 3bc6e1db..d17c1486 100644
--- a/po/te.po
+++ b/po/te.po
@@ -12,8 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-06-27 15:21+0530\n"
 "Last-Translator: Sasi Bhushan Boddepalli <sasi@swecha.net>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
@@ -24,231 +25,254 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "నెట్‌వర్క్"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "మీ నెట్వర్కు అనుసంధానములను నిర్వహించు"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "నెట్వర్కు అనుసంధానములు"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "మీ నెట్వర్కు అనుసంధానము అమర్పులను నిర్వహించండి మరియు మార్చండి"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "అనుసంధానము నోటీసులను అచేతనముచేయుము"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "నెట్వర్కునకు అనుసంధానమవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "అననుసంధానపు నోటీసులను అచేతనముచేయుము"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "నెట్వర్కునుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చుము. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "VPN ప్రకటనలను డిసేబుల్ చెయ్యి "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 "VPN నుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చుము. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "నెట్వర్కులు అందుబాటులోవున్నాయి నోటీసు అణిచివేయుము"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "వైర్‌లెస్ నెట్వర్కులు అందుబాటులో వున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "స్టాంప్"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "అమరికలు కొత్త వర్షన్‌కు మైగ్రేట్ కావాలా అనేది నిర్ణయించుటకు వుపయోగించబడుతుంది."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi సృష్టించుట అచేతనము చేయుము"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "అప్లెట్‌ను వుపయోగించునప్పుడు తాత్కాలిక  నెట్వర్కుల సృష్టీకరణను అచేతనము చేయుటకు TRUE వుంచండి."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA ధృవీకరణపత్రమును విస్మరించు "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "EAP ప్రమాణీకరణ లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే  ఇది  సెట్ చెయ్యండి."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "EAP ప్రామాణిక దశ 2 లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే సెట్ చెయ్యండి."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "నెట్వర్కు నిర్వాహిక"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "నెట్వర్కు అనుసంధానము లేదు"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "వైరు‌గల 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "అనుసంధానించు (_o)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "నెట్వర్కు పేరు (_N):"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "అనుసంధానమును సృష్టించడం/క్రియాత్మకం చేయుటలో విఫలమైనది"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "తెలియని దోషము"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "అనుసంధానమగుట విఫలం"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "పరికరము అననుసంధానమురద్దు అగుటలో విఫలము"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "అననుసంధానమురద్దు విఫలము"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "అనుసంధానం క్రియాత్మకంలో విఫలమైంది"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ఈ సందేశమును మరలా చూపవద్దు"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -258,7 +282,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' అననుసంధానించబడింది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -277,7 +301,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ అనుకోకుండా ఆపివేయబడింది."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ చెల్లని ఆకృతీకరణను తిప్పియిచ్చింది."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అనుసంధానపు ప్రయత్నం సమయం ముగిసింది."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ సమయం లోపల ప్రారంభంకాలేదు."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ ప్రారంభమవుటలో విఫలమైంది."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అక్కడ చెల్లునటువంటి VPN రహస్యాలు లేవు."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే చెల్లని VPN రహస్యాలు."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -341,7 +365,7 @@ msgstr ""
 "\n"
 "VPN అనుసంధానము '%s' విఫలమైంది."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -352,19 +376,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN కనెక్షన్ విజయవంతంగా స్థాపించబడింది.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN లాగిన్ సందేశము"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN అనుసంధానము విఫలమైంది"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -377,7 +401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -390,621 +414,650 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "పరికరము సిద్దముకాలేదు (ఫర్మువేర్ తప్పిపోయినది)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "పరికరము సిద్దముకాలేదు"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "అననుసంధానించబడింది"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "అననుసంధానించుము"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "పరికరము నిర్వహించబడలేదు"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ఎటువంటి నెట్వర్కు పరికరములు అందుబాటులోలేవు"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN అనుసంధానములు"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "VPN ఆకృతీకరించుము... (_C)"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN అనుసంధానములు"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "నెట్‌వర్క్ మ్యానేజర్ నడుచుటలేదు..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "నెట్వర్కింగ్ అచేతనమైంది"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "వైర్‌లేని విధం చేతనముచేయుము (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "సూచన ప్రకటనలను చేతనముచేయుము (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "అనుసంధానము సమాచారము (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "అనుసంధానములను సవరించు..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "గురించి (_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "మీరు '%s'కు అనుసంధానించబడినారు."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "అననుసంధానించబడింది"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "నెట్వర్కు అనుసంధానము అననుసంధానించబడింది."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "నెట్వర్కు అనుసంధానము '%s' సిద్దముచేయుచున్నది..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "నెట్వర్కు అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరము..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "'%s' కొరకు నెట్వర్కు చిరునామాను అభ్యర్ధిస్తోంది..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "నెట్వర్కు అనుసంధానము '%s' క్రియాశీలము"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "VPN అనుసంధానము '%s'ను ప్రారంభించుచున్నది..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' కొరకు VPN చిరునామాను అభ్యర్దించుచున్నది..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN అనుసంధానము '%s' క్రియాశీలం"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "నెట్వర్కు అనుసంధానము లేదు"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "తప్పయిన PUK కోడ్; దయచేసి మీ వుత్పాదకుని సంప్రదించుము."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "తప్పయిన PIN కోడ్; దయచేసి మీ వుత్పాదకుని సంప్రదించుము."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "అన్‌లాక్ కోడ్‌ను పంపుచున్నది..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "అందుబాటులోవుంది"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "అనుసంధానము యేర్పరచబడింది"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "మీరు యిప్పుడు మొబైల్ బ్రాడ్‌బ్యాండ్ నెట్వర్కునకు అనుసంధానించబడి వున్నారు."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ నెట్వర్కు సంకేతపదము"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "మీరు యిప్పుడు హోమ్ నెట్వర్కునకు రిజిస్టరైనారు."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "మీరు యిప్పుడు రోమింగ్  నెట్వర్కునకు రిజిస్టరైనారు."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "మీరు యిప్పుడు మొబైల్ బ్రాడ్‌బ్యాండ్ నెట్వర్కునకు అనుసంధానించబడి వున్నారు."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ప్రిపేర్ చేయబడుతోంది..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ఆకృతీకరించబడుతోంది..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలము"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "స్వయంచాలక ఈథర్‌నెట్"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "వైర్‌తో నెట్వర్క్సు (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "వైర్‌తో నెట్వర్కు (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "వైర్‌తో నెట్వర్క్సు"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "వైర్‌తో నెట్వర్కు"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "మీరు యిప్పుడు వైర్ నెట్వర్కునకు అనుసంధానించబడినారు."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "వైర్ నెట్వర్కు అనుసంధానమును సిద్దపరుస్తోంది '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' కొరకు వినియోగదారి ధృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "'%s' కొరకు వైర్ నెట్వర్కు చిరునామాను అభ్యర్దిస్తోంది..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL దృవీకరణము"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ఏదీకాదు)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "కొత్త అనుసంధానమును జతచేయుటలో విఫలము"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "వైర్‌తో నెట్వర్క్సు (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "వైర్‌తో నెట్వర్కు (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "వైర్‌తో నెట్వర్కు"
 msgstr[1] "వైర్‌తో నెట్వర్కు"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX అచేతనమైంది"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WIMAX హార్డ్వేరు స్విచ్ వల్ల నిరుపయోగమైబడినది"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "మరిన్ని నెట్వర్కులు"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "వైర్‌లెస్ నెట్వర్కులు అందుబాటులోవున్నాయి"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "వైర్‌లెస్ నెట్వర్కునకు అనుసంధానమగుటకు నెట్వర్క్ మెనూని ఉపయోగించుము"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "మీరు యిప్పుడు వై-ఫై నెట్వర్కు '%s'కు అనుసంధానించబడినారు."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "నెట్వర్కు అనుసంధానము '%s' సిద్దముచేయుచున్నది..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "వైర్‌లేని నెట్వర్కు '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "'%s' కొరకు నెట్వర్కు చిరునామాను అభ్యర్ధిస్తోంది..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s' క్రియాశీలము: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "అనుసంధానమును క్రియాత్మకం చేయుటలో విఫలం"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "అనుసంధానము సమాచారమును ప్రదర్శించుటలో దోషము:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "గతిక WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "చిరునామాలు"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (అప్రమేయ)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "తెలియదు"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP చిరునామా"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "బ్రాడ్‌కాస్ట్ చిరునామా"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "సబ్‌నెట్ మాస్క్"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ప్రాధమిక DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ద్వితీయ DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "టర్నరీ DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ఈథర్‌నెట్ (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "సాధారణం"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "అంతరవర్తి"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "హార్డువేర్ చిరునామా"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "డ్రైవర్"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "వేగము"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "రక్షణ:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "అప్రమేయ రూట్"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "వదిలివేయినది"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "సంకేతపదము:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN రకము "
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN గేట్‌వే"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN వినియోగదారినామము "
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN ధ్వజము "
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "పీఠము అనుసంధానము "
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "తెలియదు"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "ఎటువంటి చెల్లునటువంటి క్రియాశీల అనుసంధానములు కనబడలేదు!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "కాపీరైట్ © 2004-2008 Red Hat, Inc.\n"
 "కాపీరైట్ © 2005-2008 Novell, Inc.మరియు వేరే చాలా సంస్థ అనువాదులు"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "మీ నెట్వర్కు పరికరములను మరియు అనుసంధానములను నిర్వహించుటకు ప్రకటన ప్రాంత ఆప్లెట్."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "నెట్‌వర్క్ మ్యానేజర్ వెబ్‌సైట్"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "కృష్ణబా"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్ కొన్ని అవసరమైన వనరులను కనుగొనలేకపోయింది(.ui ఫైలు కనుగొనబడలేదు)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "వనరులు తప్పిపోయినవి"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ నెట్వర్కు సంకేతపదము"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "'%s'కు అనుసంధానమగుటకు వొక సంకేతపదము అవసరమైంది."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "సంకేతపదము:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1012,25 +1065,25 @@ msgid ""
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PIN అవసరము."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN కోడ్:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "పిన్  కోడ్ చూపుము"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1038,35 +1091,42 @@ msgid ""
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PUK కోడ్ అవసరము."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK కోడ్:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "కొత్త PIN కోడ్:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "కొత్త PIN కోడ్‌ను మరలా-ప్రవేశపెట్టుము:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "అనుసంధానము సమాచారము"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "కొత్త  PAN అనుసంధానమును సృష్టించలేక పోయింది: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1075,58 +1135,58 @@ msgstr ""
 "IP చిరునామాలు మీ కంప్యూటర్‌ను నెట్వర్కునందు గుర్తించినవి.  IP చిరునామాను జతచేయుటకు \"జతచేయి\" "
 "బటన్ వత్తుము."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "తొలగించు (_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "స్వయంచాలకంగా పొందినటువంటి రూట్లను వదిలివేయుము (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "ఈ నెట్వర్కు నందలి వనరులకొరకు ఈ అనుసంధానమును మాత్రమే వుపయోగించుము (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "చేతనపరచినట్లైతే, ఈ అనుసంధానము యెప్పుడూకూడా అప్రమేయ నెట్వర్కు అనుసంధానమువలె వుపయోగించబడదు."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "సృష్టించుము..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "VPN అనుసంధానము విధమును  ఎంచుకొనుము"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1138,210 +1198,278 @@ msgstr ""
 "సృష్టించాలని అనుకొనుచున్న VPN అనుసంధానము రకము జాబితానందు కనిపించకపోతే, మీరు సరైన VPN ప్లగ్‌యిన్ "
 "సంస్థాపన కలిగివుండక పోవచ్చును."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "సేవ (_S):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "రౌండ్-రాబిన్"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "క్రియాశీల బ్యాకప్"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "బ్రాడ్‌కాస్ట్"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "అడాప్టివ్ ట్రాన్స్‌మిట్ లోడ్ బాలెన్సింగ్"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "అడాప్టివ్ లోడ్ బాలెన్సింగ్"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (సిఫార్సుచేసిన)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "బాండెడ్ అనుసంధానములు (_c):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "రీతి (_o):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "సవరించు (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "మానిటరింగ్ ఫ్రీక్వెన్సీ (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "మిసె"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ఇంటర్ఫేస్ పేరు (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "లింక్ మానిటరింగ్ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP లక్ష్యాలు (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "లింక్ స్థితిని పరిశీలిస్తున్నప్పుడు చూడటానికి, ఒక ఐపి చిరునామా, లేదా కామాతో-వేరుచేసిన ఐపి చిరునామాల జాబితా."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "లింక్ అప్ ఆలస్యం (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "లింక్ డౌన్ ఆలస్యం (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "ప్రాధమిక DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 msgstr "MTU(_M):"
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "బైట్లు"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "లింక్ డౌన్ ఆలస్యం (_d):"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "స్వయంచాలకం"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "అప్రమేయ"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1352,437 +1480,530 @@ msgstr ""
 "చిరునామాగా వుపయోగించబడును. ఈ విశేషతను MAC క్లోనింగ్ లేదా స్పూఫింగ్‌గా తెలుపుబడుతోంది.  ఉదా: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "చిరునామా"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "చిరునామా"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "హార్డువేర్ చిరునామా:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ఏ పరికరమైనా"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "తెలియని దోషము కారణంగా అనుసంధానము రహస్యాలు నవీకరించుటకు విఫలమైంది."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ఈ అనుసంధానము కొరకు 802.1_X రక్షణ వుపయోగించుము"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "వాడుకరిపేరు (_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "సేవ (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "సంకేతపదమును చూపుము (_w)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "సంకేతపదము (_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "అంతరవర్తి"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "స్వయంచాలకంగా"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "పురి జత(TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "అటాచ్ మెంట్ యూనిట్ ఇంటర్ఫేస్(AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "మధ్యస్థత  స్వతంత్రమైన సంవిధానం(MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "వదిలివేయి"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "మానవీయం"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "పోర్ట్ (_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "సేవ (_S):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "అప్రమేయ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "వదిలివేయి"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "బ్రాడ్‌కాస్ట్ చిరునామా:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "వేగము (_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "పూర్తి డప్లెక్స్ (_x)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "ఏదీకాదు"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "మీరు యిప్పుడు వైర్ నెట్వర్కునకు అనుసంధానించబడినారు."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "స్వయచాలకంగా ఈ పరికరమును అన్‌లాక్ చేయు"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "అనుసంధానము సమాచారము (_I)"
+msgid "_Metered connection"
+msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "స్వయంచాలకంగా అనుసంధానించుము (_a)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1791,7 +2012,7 @@ msgstr ""
 "IP చిరునామాలు మీ కంప్యూటర్‌ను నెట్వర్కునందు గుర్తించినవి.  IP చిరునామాను జతచేయుటకు \"జతచేయి\" "
 "బటన్ వత్తుము."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1799,127 +2020,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "స్వయంచాలక, చిరునామాలు మాత్రమే"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "చిరునామాలు"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "బదిలీ తీరు (_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "డాటాగ్రామ్"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "అనుసంధానించెను"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "బదిలీ తీరు (_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "పరికరం పేరు + సంఖ్య"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ఈథర్‌నెట్ (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "నిర్దేశిక DNS అమరికలు తో స్వయం చాలకం "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "లింకు-స్థానిక "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "ఇంతర కంప్యూటర్లకు భాగస్వామ్యపరచబడింది"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "విధానము (_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1929,8 +2154,8 @@ msgstr ""
 "మీ కంప్యూటర్ యొక్క ఆకృతీకరణను మలచుటకు DHCP క్లైంట్ గుర్తింపుదారి నెట్వర్కు నిర్వహణాధికారిని "
 "అనుమతించును.  మీరు DHCP క్లైంట్ గుర్తింపుదారిని వుపయోగించవలెనంటే, దానిని యిచట ప్రవేశపెట్టుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1938,25 +2163,26 @@ msgstr ""
 "హోస్ట్ నామములను పరిష్కరించునప్పుడు వుపయోగించిన డొమైన్స్. బహుళ డొమైన్లను వేరుచేయుటు కామాలను "
 "వుపయోగించుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP క్లైంట్ ID:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "శోధించుము (_S) ఈ డొమైన్లను: "
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS సేవికలు:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1964,11 +2190,11 @@ msgstr ""
 "డొమైన్ నేమ్ సర్వర్ల యొక్క IP చిరునామాలు హోస్టు నామములను పరిష్కరించుటకు వుపయోగించబడెను. బహుళ డొమైన్ "
 "నేమ్ సర్వర్ చిరునామాలను వేరుచేయుటకు కామాలను వుపయోగించుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "ఈ అనుసంధానము పూర్తిచేయుటకు IPv_4 చిరునామీకరణ అవసరము"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1976,25 +2202,34 @@ msgstr ""
 "IPv6-సామర్ధ్యపు నెట్వర్కులకు అనుసంధానమగునప్పుడు, IPv4 ఆకృతీకరణ విఫలమైతే అనుసంధానము పూర్తి "
 "అగుటకు అనుమతించును అయితే IPv6 సఫలమైతే."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "దారులు...(_R)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "అచేతనమైన"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2004,15 +2239,19 @@ msgstr ""
 "డొమైన్ నేమ్ సర్వర్ల యొక్క IP చిరునామాలు హోస్టు నామములను పరిష్కరించుటకు వుపయోగించబడెను. బహుళ డొమైన్ "
 "నేమ్ సర్వర్ చిరునామాలను వేరుచేయుటకు కామాలను వుపయోగించుము."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ఈ అనుసంధానము పూర్తగుటకు IPv_6 చిరునామీకరణ అవసరము"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2020,752 +2259,859 @@ msgstr ""
 "IPv4-capable నెట్వర్కులకు అనుసంధానమగునప్పుడు, IPv6 ఆకృతీకరణ విఫలమైతే అనుసంధానము "
 "పూర్తగుట అనుమతించును అయితే IPv4 ఆకృతీకరణ సఫలమైతే."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "మెట్రిక్"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "దిగుమతి (_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "ప్రాథమికం"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "సంఖ్య (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "అధునాతనం"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "నెట్వర్కు ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "మార్చు..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "పిన్ (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "హోమ్ నెట్వర్కు అందుబాటులో లేకపోతే రోమింగ్‌ను అనుమతించుము(_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "సంకేతపదములను చూపుము (_w)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "ధృవీకరణ "
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "అనుమతించిన విధానాలు:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "విధానాలను ఆకృతీకరించుము (_M)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "కుదింపు"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "పాయింట్-నుండి-పాయింట్ ఎన్క్రిప్షన్ వుపయోగించుము (MPPE) (_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-బిట్ ఎన్క్రిప్షన్ అవసరము (_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "స్థితివంత MPPE వుపయోగించుము (_s)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_BSD డాటా కుదింపును అనుమతించుము"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "డిఫ్లేట్ డాటా కుదింపును అనుమతించుము (_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP పీఠిక(హెడర్) కుదింపును వుపయోగించుము"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "ప్రతిధ్వని"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPP _echo ప్యాకెట్లను పంపుము"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "విధానము (_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "విధానము (_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "అధునాతనం"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "వైర్‌తో నెట్వర్క్సు"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "రక్షణ(_e):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "వ్యక్తిగత కీ (_k):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "లింక్ అప్ ఆలస్యం (_u):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "లింక్ డౌన్ ఆలస్యం (_d):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP లక్ష్యాలు (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP లక్ష్యాలు (_t):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ఈథర్‌నెట్ (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "స్వయంచాలక ఈథర్‌నెట్"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "హార్డువేర్ చిరునామా:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "హార్డువేర్ చిరునామా:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "బదిలీకరణ శక్తి (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "బదిలీకరణ శక్తి (_w):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "ఇంటర్ఫేస్ పేరు (_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "పరికరం పేరు + సంఖ్య"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + సంఖ్య"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "రక్షణ(_e):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "బదిలీకరణ శక్తి (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "రేటు (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "ప్రసారమార్గము (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "బాండ్ (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "<b>అనుమతించిన ధృవీకరణ విధానములు</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "పోడిగించదగు ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "సంకేతపదము ధృవీకరణ నిభందన"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "మైక్రోసాఫ్ట్ ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "మైక్రోసాఫ్టు ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రొటోకాల్ వర్షన్ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2774,443 +3120,482 @@ msgstr ""
 "చాలా సందర్భాలలో, ఉత్పాదకుల PPP సేవికలు అన్ని దృవీకరణ విధానాలను మద్దతిస్తాయి. ఒకవేళ అనుసంధానములు "
 "విఫలమైతే, కొన్ని విధానాలకు మద్దతును అచేతనముచేయుటకు ప్రయత్నించుము."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ఇన్ఫిబాండ్"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "బాండ్"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "బ్రిడ్జి"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN అనుసంధానమును సరిగా దిగుమతి చేయుటలో VPN ప్లగ్‌యిన్ విఫలమైంది\n"
-"\n"
-"దోషము: VPN సేవా రకములేదు."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN అనుసంధానమును దిగుమతి చేయలేకపోయింది"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"ఫైలు '%s' చదువబడలేక పోయింది లేదా గుర్తించదగు VPN అనుసంధానపు సమాచారమును కలిగిలేదు\n"
+"VPN అనుసంధానమును సరిగా దిగుమతి చేయుటలో VPN ప్లగ్‌యిన్ విఫలమైంది\n"
 "\n"
-"దోషము: %s"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "తెలియని దోషము"
+"దోషము: VPN సేవా రకములేదు."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "దిగుమతి చేయుటకు ఫైలును యెంపికచేయుము"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "హార్డువేర్"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "వర్చ్యువల్"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "భద్రపరచిన VPN ఆకృతీకరణను దిగుమతిచేయి..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "తెలియని దోషము కారణంగా అనుసంధానము సరికూర్పరి డైలాగ్ సిద్దపరచబడలేక పోయింది."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "కొత్త అనుసంధానమును సృష్టించలేక పోయింది"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "అనుసంధానము తొలగింపు విఫలమైంది"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "మీరు ఖచ్చితంగా అనుసంధానము %sను తొలగించుదామని అనుకొనుచున్నారా?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN అనుసంధానములు"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "చిరునామా"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "నెట్‌మాస్క్"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "గేట్‌వే"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "మెట్రిక్"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ప్రిఫిక్స్"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "సరికూర్చుచున్నది %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "పేరు-లేని అనుసంధానమును సరికూర్చుచున్నది"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "అనుసంధానము పేరు (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "సరికూర్పరి సిద్దపరచుటలో దోషము"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "అనుసంధానము సరికూర్పరి అవసరమైన కొన్ని వనరులను కనుగొనలేక పోయింది (గ్లేడ్ ఫైలు కనుగొనబడలేదు)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "భద్రపరుచు (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "ఈ అనుసంధానమునకు చేసిన యే మార్పులనైనా దాయుము."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ఈ మిషన్‌యొక్క వినియోగదారులందరికి ఈ అనుసంధానమును దాయుటకు దృవీకరించుము."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "అనుసంధానమును సృష్టించలేక పోయింది"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "అనుసంధానమును సరికూర్చలేక పోయింది"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "అనుసంధానము సరికూర్పరి డైలాగును సృష్టించుటలో తెలియని దోషము."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "సరికూర్పరి సిద్దపరచుటలో దోషము"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "EAP ప్రమాణీకరణ లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే  ఇది  సెట్ చెయ్యండి."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "అనుసంధానము పేరు (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "ఎగుమతి... (_E)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "లేబుల్"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "లేబుల్"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ఎప్పటికికాదు"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ఇప్పుడు"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d నిముషం క్రితం"
 msgstr[1] "%d నిముషాల క్రితం"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d గంట క్రితం"
 msgstr[1] "%d గంటల క్రితం"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d రోజు క్రితం"
 msgstr[1] "%d రోజుల క్రితం"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d నెల క్రితం"
 msgstr[1] "%d నెలల క్రితం"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d సంవత్సరం క్రితం"
 msgstr[1] "%d సంవత్సరాల క్రితం"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "పేరు"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "చివరిగా వుపయోగించిన"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుము"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుటకు దృవీకరించుము"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుము"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుటకు ధృవీకరించుము"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "మద్దతీయనటువంటి మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము రకము."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "'%s' అనుసంధానమును ఎలా  సృష్టించలేక పోయింది"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "అనుసంధానము  సృష్టించుటలో దోషము."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "'%s' అనుసంధానమును ఎలా  సృష్టించలేక పోయింది"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID '%s' తో ఒక సంభందం కనుగొన బడలేదు"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "నెట్వర్కు అనుసంధానములు"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN అనుసంధానములు"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X రక్షణ"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Wi-Fi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "ఈ అనుసంధానము కొరకు 802.1_X రక్షణ వుపయోగించుము"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "బ్లూటూత్ పరికరమును కనుగొనలేక పోయినది."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "వైర్‌లేని నెట్వర్కు"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "బాండ్ వాడుకరి ఇంటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ప్రాధమిక DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "బాండ్ అనుసంధానము %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
@@ -3218,34 +3603,39 @@ msgstr "వైరుగల అనుసంధానము %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL అనుసంధానము %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3255,57 +3645,56 @@ msgstr ""
 "ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
 "అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "వదిలివేయినది"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ఈథర్‌నెట్ (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "అప్రమేయ"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3316,183 +3705,187 @@ msgstr ""
 "ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
 "అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "ఇన్ఫిబాండ్ వాడుకరి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ఇన్ఫిబాండ్ అనుసంధానము %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "స్వయంచాలక (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "స్వయంచాలక (VPN) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "స్వయంచాలక, చిరునామాలు మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "స్వయంచాలక (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "స్వయంచాలక (PPPoE) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "స్వయంచాలక (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "స్వయంచాలక (DHCP) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "లింకు-స్థానిక మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "అదనపు _DNS సేవికలు:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "అదనపు శోధించుము (_S) ఈ డొమైన్లను: "
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s కొరకు IPv4 రూట్లు సరికూర్చుచున్నది"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 అమరికలు"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "స్వయంచాలక ,DHCP మాత్రమే"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s కొరకు IPv6 రూట్లు సరికూర్చుట"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 అమరికలు"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "DSL వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "DSL అనుసంధానము %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s స్లేవ్ %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "మద్దతీయనటువంటి మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము రకము."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకుని రకమును యెంపికచేయుము"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3501,90 +3894,86 @@ msgstr ""
 "మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకుడు వుపయోగించు సాంకేతికతను యెంపికచేయుము.  మీకు నిర్ధారణ లేకపోతే, మీ "
 "ఉత్పాదకుడిని అడగండి."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "నా ఉత్పాదకుడు _GSM-ఆధారిత సాంకేతికతను వాడుచున్నాడు (అనగా GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "నా ఉత్పాదకుడు C_DMA-ఆధారిత సాంకేతికతను వుపయోగించుచున్నాడు (అనగా 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ఏదీకాదు"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s కొరకు PPP ధృవీకరణ విధానములను సరికూర్చుచున్నది"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP అమరికలు"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP వినియోగదారి యింటర్ఫేస్ లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "బాండ్ వాడుకరి ఇంటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
@@ -3592,11 +3981,11 @@ msgstr "వైరుగల అనుసంధానము %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
@@ -3604,59 +3993,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "నెట్వర్కు అనుసంధానము లేదు"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "IPv4 వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN అనుసంధానము %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN వినియోగదారి యింటర్ఫేస్ లోడుచేయలేకపోయింది."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' కొరకు VPN ప్లగ్‌యిన్ సేవను కనుగొనలేక పోయింది."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' కొరకు VPN ప్లగ్‌యిన్ సేవను కనుగొనలేక పోయింది."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "అనుసంధానమగుట విఫలం"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN వినియోగదారి యింటర్ఫేస్ లోడుచేయలేకపోయింది."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' కొరకు VPN ప్లగ్‌యిన్ సేవను కనుగొనలేక పోయింది."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN అనుసంధానము %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "VPN అనుసంధానము విధమును  ఎంచుకొనుము"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3667,7 +4056,7 @@ msgstr ""
 "సృష్టించాలని అనుకొనుచున్న VPN అనుసంధానము రకము జాబితానందు కనిపించకపోతే, మీరు సరైన VPN ప్లగ్‌యిన్ "
 "సంస్థాపన కలిగివుండక పోవచ్చును."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3676,7 +4065,7 @@ msgstr ""
 "ఈ ఐచ్చికము ఈ అనుసంధానమును BSSID ద్వారా ప్రవేశపెట్టబడిన వైర్‌లెస్ యాక్సిస్ పాయింట్ (AP)కు లాక్ చేయును. "
 "Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3686,98 +4075,96 @@ msgstr ""
 "ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
 "అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ఏ పరికరమైనా"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "వైరుగల అనుసంధానము %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Key (Hex లేదా ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit సంకేతపదము"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "గతిక(డైనమిక్) WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ఎంటర్‌ప్రైజ్"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Wi-Fi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది; Wi-Fi అమరిక తప్పిపోయింది."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "వైర్‌లేనివిధానికి రక్షణ"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "\"%s\" నామముతో వొక ఫైలు యిప్పటికేవుంది."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "పునఃస్థాపించు (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "మీరు దాయుచున్న VPN అనుసంధానముతో మీరు %sను పునఃస్థాపించుదామని అనుకొనుచున్నారా?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "VPN అనుసంధానమును ఎగుమతిచేయలేదు"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3788,221 +4175,106 @@ msgstr ""
 "\n"
 "దోషము: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "VPN అనుసంధానమును ఎగుమతిచేయుము..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "అన్‌లాక్ (_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "స్వయచాలకంగా ఈ పరికరమును అన్‌లాక్ చేయు"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "అనుసంధానము సమాచారము"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "వ్యక్తిగత కీ (_k):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము క్రింది అమరికలతో ఆకృతీకరించబడింది:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "మీ పరికరము:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "మీ ఉత్పాదకుడు:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "మీ ప్లాన్:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"మీరు యెంపికచేసిన అమర్పులను వుపయోగించుతూ వొక అనుసంధానము యిప్పుడు మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకునికి "
-"చేయబడుతుంది.  ఒకవేళ అనుసంధానము విఫలమయినా లేదా మీరు నెట్వర్కు వనరులను వుపయోగించలేకపోయినా, మీ "
-"అమర్పులను వొకటికిరెండుసార్లు పరిశీలించండి.  మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము అమరికలను మార్చుటకు, "
-"సిస్టమ్ >> అభీష్టాలు మెనూనుండి \"నెట్వర్కు అనుసంధానాలు\" యెంచుకొనుము."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "నా దేశము జాబితాచేసి లేదు"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "జాబితాచేయని"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "మీ ప్లాన్ యెంపికచేయుము (_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "ఎంపికచేసిన ప్లాన్ _APN (యాక్సిస్ పాయింట్ నేమ్):"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"హెచ్చరిక: సరికాని ప్లాను యెంచుకొనుట మీ బ్రాండ్‌బాండ్ ఖాతా బిల్లింగ్ అసౌకర్యాలకు కారణం కావచ్చును లేదా "
-"అనుసంధానతను నిరోధించవచ్చును.\n"
-"\n"
-"మీరు మీ ప్లాన్ పట్ల నిర్ధారణతో లేకపోతే మీ ప్లానుయొక్క APN కొరకు దయచేసి మీ ఉత్పాదకునిని అడుగండి."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "మీ బిల్లింగ్ ప్లానును యెంచుకొనుము"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "నా ప్లాను జాబితాచేసి లేదు..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "జాబితానుండి మీ ఉత్పాదకునిని యెంపికచేయుము (_l):"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ఉత్పాదకుడు"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr ""
-"నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను (_m):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ఉత్పాదకుడు:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "నా ఉత్పాదకుడు GSM సాంకేతికతను వుపయోగించుతున్నాడు (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "నా ఉత్పాదకుడు CDMA సాంకేతికతను వుపయోగించుతున్నాడు (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "మీ ఉత్పాదకునిని యెంచుకొనుము"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "దేశము లేదా ప్రాంతం  జాబితా"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "నా దేశము జాబితాచేసి లేదు"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "మీ ఉత్పాదకునియొక్క దేశములేదా ప్రాంతమును యెంచుకొనుము"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "సంస్థాపించిన GSM పరికరము"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "సంస్థాపించిన CDMA పరికరము"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ఏ పరికరమైనా"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4010,230 +4282,308 @@ msgstr ""
 "సెల్యులార్ (3G) నెట్వర్కునకు మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును సులువుగా అమర్చుటకు ఈ సహాయకి మీకు "
 "తోడ్పడుతుంది."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "మీకు ఈ క్రింది సమాచారము అవసరమౌతుంది:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "మీ బ్రాడ్‌బాండ్ ఉత్పాదకుని నామము"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ నామము"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "కొన్ని సంధర్బాలలో) మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ APN (యాక్సిస్ పాయింట్ నామము)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "ఈ మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు అనుసంధానమును సృష్టించుము (_t):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ఏ పరికరమైనా"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును అమర్చుము"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "మీ ఉత్పాదకునియొక్క దేశములేదా ప్రాంతమును యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "జాబితానుండి మీ ఉత్పాదకునిని యెంపికచేయుము (_l):"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr ""
+"నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను (_m):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "నా ఉత్పాదకుడు GSM సాంకేతికతను వుపయోగించుతున్నాడు (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "నా ఉత్పాదకుడు CDMA సాంకేతికతను వుపయోగించుతున్నాడు (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "మీ ఉత్పాదకునిని యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "మీ ప్లాన్ యెంపికచేయుము (_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "ఎంపికచేసిన ప్లాన్ _APN (యాక్సిస్ పాయింట్ నేమ్):"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"హెచ్చరిక: సరికాని ప్లాను యెంచుకొనుట మీ బ్రాండ్‌బాండ్ ఖాతా బిల్లింగ్ అసౌకర్యాలకు కారణం కావచ్చును లేదా "
+"అనుసంధానతను నిరోధించవచ్చును.\n"
+"\n"
+"మీరు మీ ప్లాన్ పట్ల నిర్ధారణతో లేకపోతే మీ ప్లానుయొక్క APN కొరకు దయచేసి మీ ఉత్పాదకునిని అడుగండి."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "మీ బిల్లింగ్ ప్లానును యెంచుకొనుము"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము క్రింది అమరికలతో ఆకృతీకరించబడింది:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "మీ పరికరము:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "మీ ఉత్పాదకుడు:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "మీ ప్లాన్:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"మీరు యెంపికచేసిన అమర్పులను వుపయోగించుతూ వొక అనుసంధానము యిప్పుడు మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకునికి "
+"చేయబడుతుంది.  ఒకవేళ అనుసంధానము విఫలమయినా లేదా మీరు నెట్వర్కు వనరులను వుపయోగించలేకపోయినా, మీ "
+"అమర్పులను వొకటికిరెండుసార్లు పరిశీలించండి.  మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము అమరికలను మార్చుటకు, "
+"సిస్టమ్ >> అభీష్టాలు మెనూనుండి \"నెట్వర్కు అనుసంధానాలు\" యెంచుకొనుము."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ఏదీకాదు)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A ధృవీకరణపత్రము:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "తెలియదు"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "అన్‌లాక్ (_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "ఈ సంకేతపదము కొరకు ప్రతిసారి ఆడుగుము (_k)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "'%s'కు అనుసంధానమగుటకు వొక సంకేతపదము అవసరమైంది."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "సంకేతపదము (_P):"
+msgid "Sh_ow passwords"
+msgstr "సంకేతపదములను చూపుము (_w)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "సంకేతపదము (_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "సంకేతపదములను చూపుము (_w)"
+msgid "_Secondary Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "సంకేతపదము (_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "అననుసంధానించుము"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "గతిక(డైనమిక్) WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "సృష్టించుము (_r)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "వైరులేని నెట్వర్కు '%s'ను యాక్సిస్ చేసుకొనుటకు సంకేతపదములు లేదా ఎన్క్రిప్షన్ కీలు అవసరము."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "వైరులేని నెట్వర్కు ధృవీకరణము అవసరమైంది"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "వైరులేని నెట్వర్కుద్వారా ధృవీకరణము అవసరమైంది"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "కొత్త వైరులేని నెట్వర్కు"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "మీరు సృష్టించాలని అనుకొనుచున్న వైరులేని నెట్వర్కునకు వొక నామమును ప్రవేశపెట్టుము."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కు"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4242,37 +4592,56 @@ msgstr ""
 "మీరు అనుసంధానం కావాలనుకొన్న మరుగునవుండు వైరులేని నెట్వర్కుయొక్క రక్షణ వివరములను మరియు నామమును "
 "ప్రవేశపెట్టుము."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "వైర్‌లెస్ రక్షణ (_W):"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "అనుసంధానము (_n):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"నేను నా ఉత్పాదకునిని కనుగొనలేక పోయాను మరియు నేను దానిని మానవీయంగా ప్రవేశపెడుదామని అనుకొనుచున్నాను (_m):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ఉత్పాదకుడు:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "దేశము లేదా ప్రాంతం  జాబితా"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "వైరుగలవిధం"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4282,17 +4651,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "వైర్‌లెస్ రక్షణ (_W):"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "నెట్వర్కు పేరు (_N):"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "అనుసంధానము (_n):"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "వినియోగము:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4300,7 +4693,7 @@ msgstr ""
 "ఈ ప్రోగ్రామ్ నెట్‌వర్క్ మ్యానేజర్ యొక్క అంతర్భాగము (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4308,414 +4701,462 @@ msgstr ""
 "ఇది కమాండ్-లైన్ యింటరాక్షన్ కొరకు వుద్దేశించినది కాదు అయితే బదులుగా GNOME డెస్కుటాప్ వాతావరణంనందు "
 "నడుపవచ్చును."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "చేతనము కాబడలేదు"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "నమోదుకాలేదు"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "హోమ్ నెట్వర్కు (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "హోమ్ నెట్వర్కు"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "శోధించుచున్నది"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "నమోదీకరణ తిరస్కరించబడినది"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s రోమింగ్)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (రోమింగ్)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "రోమింగ్ నెట్వర్కు (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "రోమింగ్ నెట్వర్కు"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "'%s' పై '%s'సిమ్ కార్డ్ కొరకు పిన్ కోడ్ "
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN కోడ్ అవసరమైంది"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు PIN కోడ్ అవసరమైంది"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలముగా వుంది: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "రోమింగ్"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER లేదా PEM ధృవీకరణపత్రములు (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, లేదా PKCS#12 వ్యక్తిగత కీలు (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "ఒక PAC దస్త్రమును ఎంచుకొనుము"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ఫైళ్ళు (*.PAC)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "అన్ని ఫైళ్ళు"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr " గుర్తింపులేని"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "ధృవీకరణ "
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "రెండింటినీ"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "పేరులేను గుర్తింపు (_m):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC ఫైలు (_f):"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "లోపలి దృవీకరణము (_I):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "PAC అవకాశాన్ని స్వయంచాలకంగా అనుమతించు(_v)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "ధృవీకరణపత్ర అధికారికం ధృవీకరణపత్రమును యెంచుకొనుము..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "ముద్రణ 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "ముద్రణ 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A ధృవీకరణపత్రము:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP వర్షన్(_v):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-bit సంకేతపదము"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "సంకేతపదములను చూపుము (_w)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "గుర్తింపు (_d):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "టన్నెల్డ్ TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "సురక్షిత EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "ధృవీకరణ (_t):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (అప్రమేయ)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "తెరిచిన సిస్టమ్"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "భాగస్వామ్య కీ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (అప్రమేయ)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "కీ (_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "కీను చూపుము (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP విషయసూచిక (_x):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "రకము (_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (అప్రమేయ)"
+
+#~ msgid "Ignored"
+#~ msgstr "వదిలివేయినది"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "తెలియని దోషము కారణంగా అనుసంధానము రహస్యాలు నవీకరించుటకు విఫలమైంది."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "అనుసంధానము సమాచారము (_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN అనుసంధానమును దిగుమతి చేయలేకపోయింది"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "ఫైలు '%s' చదువబడలేక పోయింది లేదా గుర్తించదగు VPN అనుసంధానపు సమాచారమును కలిగిలేదు\n"
+#~ "\n"
+#~ "దోషము: %s"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "తెలియని దోషము"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "ధృవీకరణపత్ర అధికారికం ధృవీకరణపత్రమును యెంచుకొనుము..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A ధృవీకరణపత్రము:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "నెట్వర్కు నిర్వాహిక"
@@ -4752,15 +5193,6 @@ msgstr "రకము (_T):"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "స్వయంచాలకబదలాయింపు (_o)"
 
@@ -4867,12 +5299,6 @@ msgstr "రకము (_T):"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ద్వితీయ DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "టర్నరీ DNS:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
 
@@ -4918,12 +5344,6 @@ msgstr "రకము (_T):"
 #~ msgid "_Save..."
 #~ msgstr "భద్రపరుచు (_S)"
 
-#~ msgid "_Import"
-#~ msgstr "దిగుమతి (_I)"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "స్వయంచాలకంగా అనుసంధానించుము (_a)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "వినియోగదారులందరికి అందుబాటులోవుంది"
 
@@ -4954,9 +5374,6 @@ msgstr "రకము (_T):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "'%s'అనుసంధానమును ఎలా సరికూర్చాలో తెలియుటలేదు"
 
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "కొత్త  PAN అనుసంధానమును సృష్టించలేక పోయింది: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "మీ ఫోన్ యిప్పుడు వుపయోగించుటకు సిద్దముగావుంది!"
 
@@ -5055,9 +5472,6 @@ msgstr "రకము (_T):"
 #~ msgid "Unknown"
 #~ msgstr "తెలియని"
 
-#~ msgid "translator-credits"
-#~ msgstr "కృష్ణబా"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 3823debb..dbfe28c1 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet nma-0-9-8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-02-07 17:37+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik <tg@li.org>\n"
@@ -18,44 +19,52 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Шабака"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "Пайвастҳои шабакавӣ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
-msgid "Network Connections"
-msgstr "Пайвастҳои шабакавӣ"
+msgid "Advanced Network Configuration"
+msgstr "Пайвастҳои шабакавии фаъол"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 #, fuzzy
 msgid "Manage and change your network connection settings"
 msgstr ""
 "Пайвасти шабакаи дастрас вуҷуд надорад.\n"
 "Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 #, fuzzy
 msgid "Disable connected notifications"
 msgstr "Ягон огоҳӣ нест"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Ба шабака пайваст шуда истодааст..."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 #, fuzzy
 msgid "Disable disconnected notifications"
 msgstr "Қатъшуда"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -63,46 +72,46 @@ msgstr ""
 "Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор иҷро "
 "мекунад."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Ягон огоҳӣ нест"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "Ба шабакаи VPN пайваст шуда истодааст..."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 #, fuzzy
 msgid "Suppress networks available notifications"
 msgstr "Ҷустуҷӯи шабакаҳои бесими дастрас"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "Шабакаҳои Wi-Fi-и дастрас"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Тамға"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 #, fuzzy
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Оё \"window-placement\" бояд барои муайян кардани ҷойгиршавии мӯҳтавоҳо "
 "нисбати наворҳои ҳаракат истиофда шавад ё не."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+#: org.gnome.nm-applet.gschema.xml.in:31
 #, fuzzy
-msgid "Disable Wi-Fi Create"
+msgid "Disable WiFi Create"
 msgstr "Ғайрифаъол кардан"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -110,162 +119,175 @@ msgstr ""
 "Қимати \"true\" гузоред, вақте ки корбари устоди танзимро аввалин бор иҷро "
 "мекунад."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 #, fuzzy
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 #, fuzzy
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "Огоҳиҳо"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 #, fuzzy
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "Огоҳиҳо"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "зербарнома"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Ягон пайвасти шабакавӣ нест"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "зербарнома"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Санҷиши ҳаққонияти 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "Пайваст шудааст"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Номи шабака:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Хатои номаълум"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Вайроншавии пайваст"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "Қатъ _кардани пайваст"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Нокомӣ."
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Фаъолсозии пайваст қатъ шудааст"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Дигар намоиш надодани ин паём."
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -275,7 +297,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки пайвасти шабака қатъ карда шудааст."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -285,7 +307,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки пайвасти шабака қатъ шудааст."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -294,7 +316,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN ногаҳон манъ шудааст."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +327,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN танзимоти беэътиборро "
 "ирсол кард."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +337,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки вақти кӯшиши пайваст ба анҷом "
 "расидааст."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -325,7 +347,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN дар вақташ оғоз "
 "нашудааст."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -334,7 +356,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки оғози хидмати VPN қатъ шудааст."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -343,7 +365,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки паролҳои VPN нодурустанд."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -352,7 +374,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки паролҳои VPN нодурустанд."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -361,7 +383,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, fuzzy, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -372,20 +394,20 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 #, fuzzy
 msgid "VPN connection has been successfully established.\n"
 msgstr "пайваст бо муваффақият иҷро шудааст"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Паёми воридшавии VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Пайвасти VPN қатъ шудааст"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -398,7 +420,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -411,634 +433,663 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 #, fuzzy
 msgid "device not ready (firmware missing)"
 msgstr "Эҳтимол аст, ки дастгоҳ нармафзори дарунсохтро надорад"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 #, fuzzy
 msgid "device not ready"
 msgstr "Тайёр"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "Қатъшуда"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Қатъ кардани пайваст"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 #, fuzzy
 msgid "device not managed"
 msgstr "Ин дастгоҳ бо рангҳо идора намешавад."
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 #, fuzzy
 msgid "No network devices available"
 msgstr "Ягон дастгоҳи мултидиск дастрас нест"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_Пайвастҳои VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Танзим кардани VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_Пайвастҳои VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Иҷро нашудааст"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 #, fuzzy
 msgid "Networking disabled"
 msgstr "Пайвасти шабакавӣ ғайрифаъол аст"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 #, fuzzy
 msgid "Enable _Networking"
 msgstr "Фаъол кардани шабака"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 #, fuzzy
 msgid "Enable _Mobile Broadband"
 msgstr "Паҳннавори мобилӣ"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 #, fuzzy
 msgid "Enable N_otifications"
 msgstr "_Фаъол кардан"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Иттилооти _пайвастшавӣ"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Таҳрир кардани пайвастҳо..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Дар бораи барнома"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Шумо ба '%s' пайваст шудед."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Қатъшуда"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 #, fuzzy
 msgid "The network connection has been disconnected."
 msgstr "Пайваст рад карда шудааст"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Шабакаи бесим санҷиши ҳаққониятро талаб мекунад"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Суроғаи шабакавӣ"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Пайвасти шабакавии '%s' фаъол аст"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Пайвасти VPN-и '%s' фаъол аст"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Санҷиши ҳаққоният талаб мекунад, ки иттилооти корбарро тағйир диҳед"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "%s VPN"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Пайвасти VPN '%s' фаъол аст"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ягон пайвасти шабакавӣ нест"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 #, fuzzy
 msgid "NetworkManager Applet"
 msgstr "зербарнома"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Рамзи PUK нодуруст аст. Лутфан, бо провайдери худ дар тамос шавед."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Рамзи PIN нодуруст аст. Лутфан, бо провайдери худ дар тамос шавед."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Рамзи кушоишро ворид кунед"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Паҳннаври мобилӣ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Паҳннаври мобилӣ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Дастрас"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Алоқа пайваст шудааст"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Пароли шабакаи паҳннавори мобилӣ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Шумо дар шабакаи хонагӣ қайд шудед."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Шумо дар шабакаи роумингӣ қайд шудед."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Шабакаи Ethernet (Худкор)"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Шабакаҳои Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Шабакаи Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Шабакаҳои Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Шумо ба шабакаи Ethernet пайваст шудед."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Шабакаи Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Пайвасти шабакавии '%s' фаъол аст"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Санҷиши ҳаққонияти DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ҳеҷ)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Шабакаҳои Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Шабакаи Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Шабакаи Wi-Fi"
 msgstr[1] "Шабакаҳои Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi хомӯш аст"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi тавассути калиди сахтафзор хомӯш шудааст"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Шабакаҳои бештар"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Шабакаҳои Wi-Fi-и дастрас"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Шумо ба шабакаи Wi-Fi '%s' пайваст шудед."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Омодасозии пайвасти шабакавии Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Шабакаи Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Пайвасти шабакавии Wi-Fi '%s' фаъол аст: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Пайвасти шабакавии Wi-Fi '%s' фаъол аст"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Пайваст қатъ шудааст."
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 #, fuzzy
 msgid "Error displaying connection information:"
 msgstr "Ҳангоми намоиши кӯмак хатогӣ ба вуҷуд омад: %s"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP-и серҳаракат"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Суроғаҳо"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (пешфарз)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Номаълум"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Суроғаи IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Суроғаи пахш"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 #, fuzzy
 msgid "Subnet Mask"
 msgstr "Маскаи зершабака"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS-и асосӣ:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS-и иловагӣ:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS-и эҳтиётӣ:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Шабакаи Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Умумӣ"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Суроғаи сахтафзор"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Суръат"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Амният:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 #, fuzzy
 msgid "Default Route"
 msgstr "Масири пешфарз"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Радшуда"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Парол:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Навъи VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Шлюзи VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Номи корбари VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Баннери VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Пайвасти асосӣ"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Номаълум"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "Гирифтани пайвастҳои фаъол барои Интернет"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "Ҳуқуқи муаллиф © 2008-2013 Red Hat, Inc.\n"
 "Ҳуқуқи муаллиф © 2008-2013 Девид Зеутен"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 #, fuzzy
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "Вебсайт"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "Плагини лозимӣ ёфт нашуд"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 #, fuzzy
 msgid "Missing resources"
 msgstr "Манбаҳои намерасидагӣ"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 #, fuzzy
 msgid "Mobile broadband network password"
 msgstr "Пароли шабакаи паҳннавори мобилӣ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Барои пайваст шудан ба '%s' парол лозим аст."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Парол:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Кушодани SIM бо PIN лозим аст"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Кушодани SIM бо PIN лозим аст"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1046,25 +1097,25 @@ msgid ""
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Рамзи PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Намоиш додани рамзи PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Кушодани SIM бо PUK лозим аст"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Кушодани SIM бо PUK лозим аст"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1072,35 +1123,42 @@ msgid ""
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Рамзи PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Рамзи нави PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Рамзи нави PIN-ро дубора ворид кунед:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Намоиш додани рамзҳои 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Иттилооти пайвастшавӣ"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1110,60 +1168,60 @@ msgstr ""
 "ҷудошуда иборат мебошад.  Агар шумо надонед, ки дар ин ҷо чӣ бояд ворид "
 "шавад, бо маъмури шабакаи худ дар тамос шавед."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Нест кардан"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 #, fuzzy
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Нодида гирифтани масирҳои ба таври худкор бадастовардашуда"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Истифода бурдани ин пайваст _танҳо барои сарчашмаҳои ин шабака"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 #, fuzzy
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Пайвасти шабака мавҷуд нест"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Эҷод кардан…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Навъи пайваст"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1172,91 +1230,104 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr "Шумо мехоҳед, ки %s-ро бо пайвасти VPN-и захирашуда ҷойгузин кунед?"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Хидмат:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 #, fuzzy
 msgid "Round-robin"
 msgstr "ROUND"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Нусхаи эҳтиётии фаъол"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Интиқол"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 #, fuzzy
 msgid "Adaptive transmit load balancing"
 msgstr "_Бор кардан"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 #, fuzzy
 msgid "Adaptive load balancing"
 msgstr "_Бор кардан"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 #, fuzzy
 msgid "MII (recommended)"
 msgstr "MII (тавсияшуда)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "Пайвастҳои _алоқадор:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "Ҳ_олат:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Таҳрир кардан"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
-msgid "Monitoring _frequency:"
+msgid "Monitoring _frequency"
 msgstr "FREQUENCY"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "мс"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "_Номи интерфейс:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
-msgid "_Link Monitoring:"
+msgid "_Link Monitoring"
 msgstr "Нармафзори пайгирии вақти воқеӣ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "_Мақсадҳои ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 #, fuzzy
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
@@ -1268,21 +1339,22 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
-msgid "Link _up delay:"
+msgid "Link _up delay"
 msgstr "Таъхир:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
-msgid "Link _down delay:"
+msgid "Link _down delay"
 msgstr "Таъхир пеш аз пайдошавии менюҳои фаровардану поён"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Асосӣ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 #, fuzzy
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
@@ -1291,112 +1363,165 @@ msgstr ""
 "Агар танзим шавад, номи истифодашуда барои дастгоҳ дар интерфейси корбар [x-"
 "gvfs-name=]"
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
-msgid "_MTU:"
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байт"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "Арзиши _масир:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
-msgid "_Hairpin mode:"
+msgid "_Hairpin mode"
 msgstr "MODE"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "Пайвастҳои _пул:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
-msgid "_Forward delay:"
+msgid "_Forward delay"
 msgstr "Пеш"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
-msgid "_Hello time:"
+msgid "_Hello time"
 msgstr "ВАҚТ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 #, fuzzy
 msgid "s"
 msgstr "#%s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Фаъол кардани шабака"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 #, fuzzy
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Фаъол кардани хатҳои дарахт"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
-msgid "_Max age:"
+msgid "_Max age"
 msgstr "Синни ҳадди аксари файлҳои охирин"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "_Вақти фарсудашавӣ:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "худкор"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "пешфарз"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1404,451 +1529,540 @@ msgid ""
 "cloning or spoofing. Example: 00:11:22:33:44:55"
 msgstr "Суроғаи MAC"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Суроға"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Суроға"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Номи интерфейси VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Суроғаи сахтафзор:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Ҳар дастгоҳ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Вобаста ба раванди иҷроиш навсозӣ қатъ карда шуд"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Ҳамчун пайвасти Интернет истифода кардан"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "_Аввалият:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Номи корбар:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Хидмат:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "На_моиш додани парол"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Парол:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Интерфейс"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "_Интерфейси асосӣ:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "_Интерфейси асосӣ:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Худкор"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 #, fuzzy
 msgid "Twisted Pair (TP)"
 msgstr "Ҷуфти тобдор (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Интерфейси воҳиди замима (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 #, fuzzy
 msgid "Media Independent Interface (MII)"
 msgstr "Интерфейси мустақили медиа (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Мб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Мб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Рад кардан"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 #, fuzzy
 msgid "Manual"
 msgstr "Дастур"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "_Порт:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_Хидмат:"
+msgid "_Port"
+msgstr "_Порт:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Суроғаи MAC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Пароли калиди шахсӣ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Пешфарз"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Рад кардан"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Интиқол"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Пароли калиди шахсӣ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Суръат:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Пурра"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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
-#, fuzzy
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "Пайвастшавии худкор дар оғозии компютер"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Ҳа"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Не"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr ""
 "Тоза кардани ҳамаи тафсилоти ин шабака ва кӯшиш накардани пайвастшавии худкор"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
-msgid "_Automatically connect to this network when it is available"
+msgid "Automatically connect to _VPN"
 msgstr "Пайвастшавии худкор дар оғозии компютер"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Иттилооти _пайвастшавӣ"
+msgid "Firewall _zone"
+msgstr "Минтақаи _девори оташ"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "_Пайвастҳои гурӯҳӣ:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_Нодида гирифтани масирҳои ба таври худкор бадастовардашуда"
+
+#: src/connection-editor/ce-page-general.ui:167
 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
-#, fuzzy
-msgid "Firewall _zone:"
-msgstr "Минтақаи _девори оташ"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1858,7 +2072,7 @@ msgstr ""
 "ҷудошуда иборат мебошад.  Агар шумо надонед, ки дар ин ҷо чӣ бояд ворид "
 "шавад, бо маъмури шабакаи худ дар тамос шавед."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1866,132 +2080,134 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Танҳо суроғаҳои худкор (DHCP)"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Суроғаҳо"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-#, fuzzy
-msgid "_Transport mode:"
-msgstr "_Интиқол:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Диаграммаи иттилоотӣ"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Пайваст шудааст"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "_Интиқол:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Номи дастгоҳ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Ҳолат:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 #, fuzzy
 msgid "Automatic with manual DNS settings"
 msgstr "DNS-и худкор"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 #, fuzzy
 msgid "Link-Local"
 msgstr "Дар ҳоли интизори суроғаи пайванди маҳаллӣ..."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Бо компютерҳои дигар мубодилашуда"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
-msgid "_Method:"
+msgid "_Method"
 msgstr "_Усул"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -2005,35 +2221,34 @@ msgstr ""
 "метавонед инчунин конфигуратсияи худкори шабакаи DHCP-ро бо номи мизбоне, ки "
 "шумо пешниҳод мекунед, такрор кунед."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 #, fuzzy
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "Historically used domains"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
-msgid "D_HCP client ID:"
+msgid "D_HCP client ID"
 msgstr "ID-и такрории \"%s\"-и объект дар хати %d (қаблан дар хати %d)"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "_Доменҳои ҷустуҷӯӣ:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
-msgid "DNS ser_vers:"
+msgid "DNS ser_vers"
 msgstr "Серверҳои DNS-и _иловагӣ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2045,37 +2260,47 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 #, fuzzy
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 #, fuzzy
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr "Танзимот"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_Масирҳо..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Ғайрифаъол"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Wi-Fi"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2088,1256 +2313,1401 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 #, fuzzy
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr "Танзимот"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Метрӣ"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Асосӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
-msgid "Nu_mber:"
+msgid "Nu_mber"
 msgstr "_Рақам:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Иловагӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "_ID-и шабака:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Тағйир додан ба:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Шабакаи роумингӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "Намоиш додани _паролҳо"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Санҷиши ҳаққоният"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Усулҳои иҷозатшуда:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 #, fuzzy
 msgid "Configure _Methods…"
 msgstr "_Танзим кардан"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "Фишурдасозӣ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 #, fuzzy
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Нуқта"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 #, fuzzy
 msgid "_Require 128-bit encryption"
 msgstr "_Дархости кардани рамзгузории 128-бит"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 #, fuzzy
 msgid "Use _stateful MPPE"
 msgstr "Истифода бурдан ҳамчун:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 #, fuzzy
 msgid "Allow _BSD data compression"
 msgstr "Фишурдасозӣ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 #, fuzzy
 msgid "Allow _Deflate data compression"
 msgstr "Фишурдасозӣ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 #, fuzzy
 msgid "Use TCP _header compression"
 msgstr "Истифодаи лавҳаи сарварақ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Пажвок"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 #, fuzzy
 msgid "Send PPP _echo packets"
 msgstr "Пажвок"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Усул"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Ворид кардан аз файл"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Усул"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Иловагӣ"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Шабакаҳои Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Аввалият:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Калиди _шахсӣ:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Таъхир:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Таъхир пеш аз пайдошавии менюҳои фаровардану поён"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "_Мақсадҳои ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "_Мақсадҳои ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Ворид кардан аз файл"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Файлҳои JSON"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "_Пайвастҳои гурӯҳӣ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Суроғаи сахтафзор:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Суроғаи сахтафзор:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Аввалият:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Қуттии почта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Қуттии почта"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "_Интерфейси асосӣ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Номи интерфейси VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "С_уроғаи MAC-и нусхабардошта"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_Рамзи VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 #, fuzzy
 msgid "Device name + number"
 msgstr "Номи дастгоҳ:"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + рақам"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Амният:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 #, fuzzy
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 #, fuzzy
-msgid "Transmission po_wer:"
+msgid "Transmission po_wer"
 msgstr "Қуттии почта"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Мб/с"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Суръат:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Алоқа:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти васеъшаванда"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти паролӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 #, fuzzy
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 #, fuzzy
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Шабакаи Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "Шабакаи DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Шабакаи InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Алоқа"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Гурӯҳ"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Пул"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:205
-#, fuzzy
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Пайвасти VPN-и \"%s\" ба %s содир карда нашуд.\n"
-"\n"
-"Хатогӣ: %s."
 
-#: ../src/connection-editor/connection-helpers.c:217
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
-msgid "Cannot import VPN connection"
-msgstr "Пайвасти VPN ворид намешавад"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Файли \"%s\" наметавонад хонда шавад, ё ки маълумоти муайяншудаи пайвасти "
-"VPN-ро надорад\n"
+"Пайвасти VPN-и \"%s\" ба %s содир карда нашуд.\n"
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Хатои номаълум"
-
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 #, fuzzy
 msgid "Select file to import"
 msgstr "Файли JSON-ро барои воридот интихоб намоед"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Сахтафзор"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Виртуалӣ"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Пайвасти VPN ворид намешавад"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 #, fuzzy
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "китобхонаи libburn оғоз дода нашуд"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "Бойгонӣ эҷод нашуд"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Шумо мутмаин ҳастед, ки мехоҳед пайвасти %s-ро нест кунед?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_Пайвастҳои VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Суроға"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Ниқоби шабака"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрӣ"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Пешоянд"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, fuzzy, c-format
 msgid "Editing %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 #, fuzzy
 msgid "Editing un-named connection"
 msgstr "Д_игар маъқул нест"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "Номи _пайваст:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Ҳангоми омодасозии ҳаҷми ҷисмонӣ хатогӣ ба вуҷуд омад"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "Плагини лозимӣ ёфт нашуд"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Захира кардан"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 #, fuzzy
 msgid "Save any changes made to this connection."
 msgstr ""
 "Агар шумо интихоб кунед, ки ин файли конфигуратсияро бо версияи навтар "
 "ҷойиваз кунед, шумо ҳамаи тағйироти ба он даровардаро гум мекунед."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 #, fuzzy
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Таъин кардан барои ҳамаи корбарон"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Бойгонӣ эҷод нашуд"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "(Хатогӣ: муҳаррири пайвасти VPN кушода нашуд)"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 #, fuzzy
 msgid "Error initializing editor"
 msgstr "Ҳангоми омодасозии ҳаҷми ҷисмонӣ хатогӣ ба вуҷуд омад"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "Огоҳиҳо"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "Номи _пайваст:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Содир кардан..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ҳеҷ гоҳ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ҳозир"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d дақиқа пеш"
 msgstr[1] "%d дақиқа пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d соат пеш"
 msgstr[1] "%d соат пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d рӯз пеш"
 msgstr[1] "%d рӯз пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d моҳ пеш"
 msgstr[1] "%d моҳ пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d сол пеш"
 msgstr[1] "%d сол пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Иловакунии пайваст қатъ шудааст"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Пайвасти гурӯҳии %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Пайвасти гурӯҳии %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Ном"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Истифодаи охирин"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr ""
+"Инро ба арзишҳои мусбат насб кунед, ки нишондиҳандаи баъзе пешравиҳо аст, "
+"вале чӣ қадар буданашонро намедонед"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Таҳрир"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Хатои эҷоди қатори RAID"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Иловакунии пайваст қатъ шудааст"
+
+#: src/connection-editor/nm-connection-list.c:1091
 #, fuzzy
 msgid "No VPN plugins are installed."
 msgstr "Плагинҳои VPN бор намешаванд"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr ""
 "Инро ба арзишҳои мусбат насб кунед, ки нишондиҳандаи баъзе пешравиҳо аст, "
 "вале чӣ қадар буданашонро намедонед"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Таҳрир"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "%s бо шахсияти ‘%s’ дар маълумоти корбар ёфт нашуд"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+#, fuzzy
+msgid "Network Connections"
+msgstr "Пайвастҳои шабакавӣ"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_Пайвастҳои VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Амнияти 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Ҳамчун пайвасти Интернет истифода кардан"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Пайвасти алоқаи %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Шабакаи Wi-Fi"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Асосӣ:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Пайвасти алоқаи %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Пайвасти пули %d"
@@ -3345,35 +3715,40 @@ msgstr "Пайвасти пули %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Порти пул"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Интерфейси корбари порти гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 #, fuzzy
 msgid "Could not load DSL user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "_Интерфейси асосӣ:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Пайвасти DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3381,45 +3756,44 @@ msgid ""
 "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”"
 msgstr "Суроғаи шабакавӣ муайян нашудааст"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Радшуда"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Суроғаи MAC"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Пайвасти Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Пешфарз"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 #, fuzzy
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
@@ -3427,12 +3801,12 @@ msgid ""
 "firewall. Only usable if firewalld is active."
 msgstr "Минтақа сатҳи эътимоднокии пайвастро муайян мекунад"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3441,275 +3815,275 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr "Суроғаи шабакавӣ муайян нашудааст"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Пайвасти InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Пайвасти Ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Худкор (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Худкор (VPN) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 #, fuzzy
 msgid "Automatic, addresses only"
 msgstr "Танҳо суроғаҳои худкор (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Худкор (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Худкор (PPPoE) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Худкор (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Худкор (DHCP) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 #, fuzzy
 msgid "Link-Local Only"
 msgstr "Танҳо пайванди маҳаллӣ"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Серверҳои DNS-и _иловагӣ:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "_Доменҳои ҷустуҷӯии иловагӣ:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, fuzzy, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Танзимоти IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 #, fuzzy
 msgid "Could not load IPv4 user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Худкор, танҳо DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, fuzzy, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Танзимоти IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 #, fuzzy
 msgid "Could not load IPv6 user interface."
 msgstr "Интерфейси корбари PPP бор нашуд."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Пайвасти WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 #, fuzzy
 msgid "Duplicate slaves"
 msgstr "Пайвасти фармонбарон"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Татбиқкунии танзимоти нав қатъ шуд: %s"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr "Сканкунии %s барои портҳои кушод"
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s фармонбари %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 #, fuzzy
 msgid "Could not load mobile broadband user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 #, fuzzy
 msgid "Unsupported mobile broadband connection type."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 #, fuzzy
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Паҳннавори мобилӣ"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr "Провайдери шумо:"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 #, fuzzy
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "2G (GPRS/EDGE)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "EVDO"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ҳеҷ"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, fuzzy, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Танзимоти PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Интерфейси корбари PPP бор нашуд."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr ""
@@ -3718,12 +4092,12 @@ msgstr ""
 "мувофиқат мекунад.\n"
 "Файли танзимотии аслӣ тағйир наёфт."
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Пайвасти гурӯҳии %d"
@@ -3731,11 +4105,11 @@ msgstr "Пайвасти гурӯҳии %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Порти гурӯҳӣ"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Интерфейси корбари порти гурӯҳӣ бор нашуд."
@@ -3743,61 +4117,61 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (тавассути \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Ягон пайвасти шабакавӣ нест"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Пайвасти VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Интерфейси корбари VPN бор нашуд."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr ""
-"Плагин дар ҳеҷ кадоме аз манбаҳои нармафзории пайкарбандишуда ёфт нашуд"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 "Плагин дар ҳеҷ кадоме аз манбаҳои нармафзории пайкарбандишуда ёфт нашуд"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Вайроншавии пайваст"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Интерфейси корбари VPN бор нашуд."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr ""
+"Плагин дар ҳеҷ кадоме аз манбаҳои нармафзории пайкарбандишуда ёфт нашуд"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Пайвасти VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Навъи VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3805,14 +4179,14 @@ msgid ""
 "not have the correct VPN plugin installed."
 msgstr "Шумо мехоҳед, ки %s-ро бо пайвасти VPN-и захирашуда ҷойгузин кунед?"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 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"
 msgstr "Пайвасти Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3820,97 +4194,95 @@ msgid ""
 "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”"
 msgstr "Суроғаи шабакавӣ муайян нашудааст"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГҳ)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Ҳар дастгоҳ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Пайвасти Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Калиди WEP 40/128-бит (Hex ё ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Гузарвожаи WEP 128-бит"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP-и серҳаракат (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2-и Тиҷорӣ"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Амнияти Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Номи файли \"%s\" аллакай мавҷуд аст."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "Ҷ_ойгузин кардан"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, fuzzy, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Шумо мехоҳед, ки %s-ро бо пайвасти VPN-и захирашуда ҷойгузин кунед?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "Пайвасти VPN содир намешавад"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3921,429 +4293,390 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Пайвасти VPN содир намешавад"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Кушодан"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 #, fuzzy
 msgid "Automatically unlock this device"
 msgstr "Кушодани қулфи дастгоҳи дорои рамз"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Иттилооти пайвастшавӣ"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Пайвастҳои шабакавии фаъол"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Интихоби гувоҳиномаи CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Калиди _шахсӣ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Пароли калиди шахсӣ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Интихоби гувоҳиномаи CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_Гувоҳиномаи корбарӣ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 #, fuzzy
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Танзимоти паҳннавори мобилӣ"
+msgid "My country is not listed"
+msgstr "Вуҷуд надора?"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Дастгоҳи шумо:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr "Бе рӯйхат"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Провайдери шумо:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "Нақша"
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Нақшаи шумо:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "Провайдер"
 
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 #, fuzzy
-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."
-msgstr ""
-"Пайвасти шабакаи дастрас вуҷуд надорад.\n"
-"Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
+msgid "Installed GSM device"
+msgstr "GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 #, fuzzy
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Танзимоти паҳннавори мобилӣ"
+msgid "Installed CDMA device"
+msgstr "CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
-msgstr "Бе рӯйхат"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Ҳар дастгоҳ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 #, fuzzy
-msgid "_Select your plan:"
-msgstr "Нақшаи шумо:"
+msgid "New Mobile Broadband Connection"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 #, fuzzy
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN:"
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
+
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "Ба шумо иттилооти зерил лозим мешавад:"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
-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."
-msgstr "Нақшаи шумо:"
+msgid "Your broadband provider’s name"
+msgstr "Провайдери шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 #, fuzzy
-msgid "Choose your Billing Plan"
+msgid "Your broadband billing plan name"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr ""
+"(дар баъзе мавридҳо) Нақшаи биллинги пайвасти паҳннавори APN (Номи Нуқтаи "
+"Дастрасӣ)"
+
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 #, fuzzy
-msgid "My plan is not listed…"
-msgstr "Нақша"
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+#, fuzzy
+msgid "Set up a Mobile Broadband Connection"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr ""
+"<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои махсусро, "
+"масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси Wi-Fi "
+"дар назди боғи Рӯдаки” пайдо кунед.</li>"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Минтақа ё кишвари худро интихоб намоед."
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 #, fuzzy
 msgid "Select your provider from a _list:"
 msgstr "Интихоб кардан аз рӯйхати умумиҷаҳонӣ"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-msgstr "Провайдер"
-
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
-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 set up the connection _manually:"
 msgstr "%i %%"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Провайдер:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 #, fuzzy
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "3G (UMTS/HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 #, fuzzy
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "EVDO"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 #, fuzzy
 msgid "Choose your Provider"
 msgstr "Провайдери шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-#, fuzzy
-msgid "Country or Region List:"
-msgstr "Минтақа ё кишвари худро интихоб намоед."
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-#, fuzzy
-msgid "Country or region"
-msgstr ""
-"<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои махсусро, "
-"масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси Wi-Fi дар "
-"назди боғи Рӯдаки” пайдо кунед.</li>"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 #, fuzzy
-msgid "My country is not listed"
-msgstr "Вуҷуд надора?"
+msgid "_Select your plan:"
+msgstr "Нақшаи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 #, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Минтақа ё кишвари худро интихоб намоед."
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
-msgid "Installed GSM device"
-msgstr "GSM"
+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."
+msgstr "Нақшаи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 #, fuzzy
-msgid "Installed CDMA device"
-msgstr "CDMA"
+msgid "Choose your Billing Plan"
+msgstr "Нақшаи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 #, fuzzy
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
-msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Танзимоти паҳннавори мобилӣ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "Ба шумо иттилооти зерил лозим мешавад:"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Дастгоҳи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-#, fuzzy
-msgid "Your broadband provider’s name"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr "Провайдери шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-#, fuzzy
-msgid "Your broadband billing plan name"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr ""
-"(дар баъзе мавридҳо) Нақшаи биллинги пайвасти паҳннавори APN (Номи Нуқтаи "
-"Дастрасӣ)"
-
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
 #, fuzzy
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Ҳар дастгоҳ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-#, fuzzy
-msgid "Set up a Mobile Broadband Connection"
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+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."
+msgstr ""
+"Пайвасти шабакаи дастрас вуҷуд надорад.\n"
+"Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 #, fuzzy
-msgid "New Mobile Broadband Connection"
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Танзимоти паҳннавори мобилӣ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ҳеҷ)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Гувоҳиномаи C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Номаълум"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Интихоби гувоҳиномаи CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_Гувоҳиномаи корбарӣ:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Таҳрир"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Кушодан"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Пароли наверо барои корбари нав интихоб намоед:"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr ""
 "Ин пешниҳод шояд дар экрани вуруд намоиш дода шавад. Ин ба ҳамаи корбарони "
 "ин система аён мешавад. Иҷрои <b>not</b> дар ин ҷо паролро дар бар мегирад."
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "Ҳамеша ин паролро _дархост кардан"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Барои пайваст шудан ба '%s' парол лозим аст."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "_Пароли иловагӣ:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "На_моиш додани паролҳо"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Пароли иловагӣ:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "На_моиш додани паролҳо"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Пароли иловагӣ:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Парол:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Қатъ кардани пайваст"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP-и серҳаракат (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Эҷод кардан"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4351,72 +4684,97 @@ msgstr ""
 "Барои пайдо кардани дастрасӣ ба шабакаи бесими \"%s\" паролҳо ё калидҳои "
 "рамзгузорӣ лозиманд."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и нав"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_Амнияти Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Пайвастшавӣ:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Адаптери Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "%i %%"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "Минтақа ё кишвари худро интихоб намоед."
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr ""
+"<li>Кишвар, шаҳр ё кӯчаи мехостагиро ёфт кунед.</li> <li>Маконҳои махсусро, "
+"масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси Wi-Fi "
+"дар назди боғи Рӯдаки” пайдо кунед.</li>"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Симдор"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4426,446 +4784,525 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_Амнияти Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Номи шабака:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Пайвастшавӣ:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Адаптери Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Истифодабарӣ:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 #, fuzzy
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr "_Лоиҳаҳои охирин"
 
-#: ../src/main.c:45
+#: src/main.c:45
 #, fuzzy
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "Сатри иҷрои фармон"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 #, fuzzy
 msgid "not enabled"
 msgstr "_Фаъол"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 #, fuzzy
 msgid "not registered"
 msgstr "сабтшуда"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Шабакаи хонагӣ (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Шабакаи хонагӣ"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ҷустуҷӯ"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "қайдкунӣ қатъ шудааст"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s дар роуминг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Шабакаи роумингӣ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Шабакаи роумингӣ"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Рамзи PIN барои корти SIM '%s' дар '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Рамзи PIN лозим аст"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Пайвасти %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Гувоҳиномаҳои DER ё PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Калидҳои шахсии DER, PEM, ё PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Интихоби файли PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Файлҳои PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Ҳамаи файлҳо"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Ношинос"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Ҳаққоният санҷида шуд"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Ҳар ду"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Шахсияти номаълум:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_Файли PAC:"
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "Санҷиши _ҳаққонияти дохилӣ"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 #, fuzzy
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Таъминоти PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 #, fuzzy
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Интихоб кардани гувоҳиномаи Мақомоти гувоҳиномаҳо..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Версияи 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Версияи 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Гувоҳиномаи C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "_Версияи PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Гузарвожаи WEP 128-бит"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "На_моиш додани паролҳо"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Ягон гувоҳиномаи CA _лозим нест"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#, fuzzy
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "Ш_ахсият"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "ТЕЗ"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 #, fuzzy
 msgid "Tunneled TLS"
 msgstr "TLS-и нақбӣ"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP-и муҳофизатшуда (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Санҷиши ҳаққоният:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Пешфарз)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 #, fuzzy
 msgid "Open System"
 msgstr "Системаи кушод"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Калиди мубодилашуда"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Пешфарз)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Калид:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "Намоиш _додани калид"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_Индекси WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Навъ:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (пешфарз)"
+
+#~ msgid "Ignored"
+#~ msgstr "Радшуда"
+
+#, fuzzy
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Вобаста ба раванди иҷроиш навсозӣ қатъ карда шуд"
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "_Аввалият:"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "Пайвастшавии худкор дар оғозии компютер"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Иттилооти _пайвастшавӣ"
+
+#~ msgid "DSL"
+#~ msgstr "Шабакаи DSL"
+
+#, fuzzy
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Пайвасти VPN ворид намешавад"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Файли \"%s\" наметавонад хонда шавад, ё ки маълумоти муайяншудаи пайвасти "
+#~ "VPN-ро надорад\n"
+#~ "\n"
+#~ "Хатогӣ: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Хатои номаълум"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Интихоб кардани гувоҳиномаи Мақомоти гувоҳиномаҳо..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Гувоҳиномаи C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "зербарнома"
@@ -4901,15 +5338,6 @@ msgstr "_Навъ:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "Қабулкунии _худкор"
 
@@ -5132,15 +5560,6 @@ msgstr "_Навъ:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "DNS-и асосӣ:"
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS-и иловагӣ:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS-и эҳтиётӣ:"
-
 #, fuzzy
 #~ msgid "_Device MAC address:"
 #~ msgstr "Суроғаи MAC"
@@ -5201,13 +5620,6 @@ msgstr "_Навъ:"
 #~ msgstr "Худкор (PPP) танҳо суроғаҳо"
 
 #, fuzzy
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Пайвасти WiMAX %d"
-
-#, fuzzy
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -5230,10 +5642,6 @@ msgstr "_Навъ:"
 #~ msgid "Error: %s"
 #~ msgstr "!! ХАТОГӢ: %s"
 
-#, fuzzy
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Телефони шумо барои истифода омода аст!"
 
@@ -5282,9 +5690,3 @@ msgstr "_Навъ:"
 
 #~ msgid "%s Network"
 #~ msgstr "Шабакаи %s"
-
-#~ msgid "No"
-#~ msgstr "Не"
-
-#~ msgid "Yes"
-#~ msgstr "Ҳа"
diff --git a/po/th.po b/po/th.po
index 0badc0b9..e9dd5cb6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-09-12 15:27+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -19,228 +20,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "เครือข่าย"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "จัดการการเชื่อมต่อเครือข่ายของคุณ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "การเชื่อมต่อเครือข่าย"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "ตั้งค่า VPN ผิดพลาด"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "จัดการและตั้งค่าการเชื่อมต่อเครือข่ายของคุณ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อเครือข่าย"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "ปิดการแจ้งเหตุการตัดการเชื่อมต่อ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการตัดการเชื่อมต่อเครือข่าย"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "ปิดการแจ้งเหตุการเชื่อมต่อ VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อมีการเชื่อมต่อหรือตัดการเชื่อมต่อกับเครือข่าย VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "ปิดการแจ้งเหตุเมื่อมีเครือข่ายให้เชื่อมต่อ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อพบเครือข่ายไร้สายที่เชื่อมต่อได้"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "ประทับตรา"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "ใช้ในการกำหนดว่าควรแปลงค่าตั้งไปเป็นรุ่นใหม่หรือไม่"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "ปิดการสร้าง Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการสร้างเครือข่ายเฉพาะกิจขณะใช้แอพเพล็ต"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในการยืนยันตัวตนแบบ EAP"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในขั้นที่ 2 ของการยืนยันตัวตนแบบ EAP"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "แอพเพล็ต NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "ไม่ได้เชื่อมกับเครือข่าย"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "แอพเพล็ต NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "การยืนยันตัวบุคคลกับเครือข่ายโยงสาย 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "เ_ชื่อมต่อ"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_ชื่อเครือข่าย:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "เฉพาะกิจ"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "สร้าง/เปิดใช้การเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ตัดการเชื่อมต่อกับอุปกรณ์ไม่สำเร็จ"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "ตัดการเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "เปิดใช้การเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "ไม่ต้องแสดงข้อความนี้อีก"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -250,7 +274,7 @@ msgstr ""
 "\n"
 "การเชื่อมต่อ VPN '%s' ถูกตัดเพราะการเชื่อมต่อเครือข่ายถูกขัดจังหวะ"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะการเชื่อมต่อถูกขัดจังหวะ"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN หยุดทำงานกะทันหัน"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN คืนค่าตั้งที่ไม่ถูกต้องกลับมา"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะหมดเวลารอเชื่อมต่อ"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +321,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN ไม่เริ่มทำงานในเวลาที่กำหนด"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +330,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN เริ่มทำงานไม่สำเร็จ"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +339,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะไม่มีข้อมูลลับ VPN ที่จะใช้เข้าระบบ"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะข้อมูลลับ VPN ไม่ถูกต้อง"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +357,7 @@ msgstr ""
 "\n"
 "เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จ"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -344,19 +368,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "การเชื่อมต่อ VPN เชื่อมต่อสำเร็จแล้ว\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "ข้อความเข้าระบบ VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "เชื่อมต่อ VPN ไม่สำเร็จ"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -369,7 +393,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -382,572 +406,597 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "อุปกรณ์ไม่พร้อม (ขาดเฟิร์มแวร์)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "อุปกรณ์ไม่พร้อม"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ตัดการเชื่อมต่อแล้ว"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ตัดการเชื่อมต่อ"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "อุปกรณ์ไม่มีการจัดการ"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "ไม่มีอุปกรณ์เครือข่ายในระบบ"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_การเชื่อมต่อ VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_ตั้งค่า VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "เพิ่มการเชื่อมต่อ VPN ใหม่"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager ไม่ได้ทำงานอยู่"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "ปิดการใช้งานเครือข่ายอยู่"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "เปิดใช้เ_ครือข่าย"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "เปิดใช้ไ_ร้สาย"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "เปิดใช้บรอดแบนด์_มือถือ"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "เปิดใช้การแ_จ้งเหตุ"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_ข้อมูลการเชื่อมต่อ"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "แก้ไขการเชื่อมต่อ..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "เ_กี่ยวกับ"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "คุณเชื่อมต่อกับ '%s' แล้ว"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ตัดการเชื่อมต่อแล้ว"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "การเชื่อมต่อเครือข่ายถูกตัดแล้ว"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "กำลังเตรียมเชื่อมต่อเครือข่าย '%s'..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย '%s'..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "กำลังขอที่อยู่สำหรับเครือข่าย '%s'..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "การเชื่อมต่อเครือข่าย '%s' เปิดทำงานแล้ว"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "กำลังเปิดการเชื่อมต่อ VPN '%s'..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย VPN '%s'..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "กำลังขอที่อยู่ VPN สำหรับ '%s'..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "การเชื่อมต่อ VPN '%s' เปิดทำงานแล้ว"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "ไม่ได้เชื่อมกับเครือข่าย"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "แอพเพล็ต NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "รหัส PUK ไม่ถูกต้อง กรุณาติดต่อผู้ให้บริการของคุณ"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "รหัส PIN ไม่ถูกต้อง กรุณาติดต่อผู้ให้บริการของคุณ"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "กำลังส่งรหัสปลดล็อค..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "เครือข่ายบรอดแบนด์มือถือ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "เครือข่ายบรอดแบนด์มือถือ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "เครือข่ายที่มี"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "เชื่อมต่อเครือข่ายแล้ว"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "คุณเชื่อมต่อกับเครือข่ายบรอดแบนด์มือถือแล้ว"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "รหัสผ่านเครือข่ายบรอดแบนด์มือถือ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายเหย้าแล้ว"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายบริการข้ามเขตแล้ว"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "คุณเชื่อมต่อกับเครือข่ายบรอดแบนด์มือถือแล้ว"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "กำลังเตรียมการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "อีเทอร์เน็ตอัตโนมัติ"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "เครือข่ายโยงสาย"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "เครือข่ายโยงสาย"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "คุณเชื่อมต่อกับเครือข่ายโยงสายแล้ว"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "กำลังเตรียมเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "กำลังขอที่อยู่จากเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "เครือข่ายโยงสาย '%s' ทำงานอยู่"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "การยืนยันตัวบุคคลกับ DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "สร้างเครือข่ายไร้สายใหม่"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "เพิ่มการเชื่อมต่อรายการใหม่ไม่สำเร็จ"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "เครือข่ายโยงสาย"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "ปิดการใช้งาน WiMAX อยู่"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX ถูกปิดไว้ด้วยสวิตช์ฮาร์ดแวร์"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "เครือข่ายเพิ่มเติม"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "มีเครือข่ายไร้สายบริเวณนี้"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ใช้เมนูเครือข่ายเพื่อเชื่อมต่อกับเครือข่ายไร้สาย"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "คุณเชื่อมต่อกับเครือข่ายไร้สาย '%s' แล้ว"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "กำลังเตรียมเชื่อมต่อเครือข่าย '%s'..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "กำลังขอที่อยู่สำหรับเครือข่าย '%s'..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "เครือข่ายไร้สาย '%s' ทำงานอยู่: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "เครือข่ายโยงสาย '%s' ทำงานอยู่"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "เปิดใช้ช่องเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "เกิดข้อผิดพลาดในการแสดงข้อมูลการเชื่อมต่อ:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP แบบผันแปร"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "ที่อยู่"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ไม่มี"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (ปริยาย)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "ที่อยู่ไอพี"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "ที่อยู่บรอดแคสต์"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "ซับเน็ตแมสก์"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "DNS แรก:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS ที่สอง:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS ที่สาม:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "อีเทอร์เน็ต (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "อินเทอร์เฟซ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "หมายเลขฮาร์ดแวร์"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ไดรเวอร์"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "ความเร็ว"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "ความปลอดภัย:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "เส้นทางปริยาย"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "ไม่ใช้"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "รหัสผ่าน:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "ชนิด VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "เกตเวย์ VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "ชื่อผู้ใช้ VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "ข้อความต้อนรับของ VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "การเชื่อมต่อฐาน"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "ไม่มีการเชื่อมต่อที่ใช้งานอยู่!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -955,48 +1004,54 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "และผู้ร่วมสมทบงานและนักแปลในชุมชนอีกเป็นจำนวนมาก"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "แอพเพล็ตพื้นที่แจ้งเหตุสำหรับจัดการอุปกรณ์เครือข่ายและการเชื่อมต่อ"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "เว็บไซต์ NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"อิสริยะ ไพรีพ่ายฤทธิ์ <markpeak@gmail.com>\n"
+"เทพพิทักษ์ การุญบุญญานันท์ <thep@linux.thai.net>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "แอพเพล็ต NetworkManager ไม่พบข้อมูลบางอย่างที่ต้องใช้ (ไม่พบแฟ้ม .ui)"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "ขาดทรัพยากร"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "รหัสผ่านเครือข่ายบรอดแบนด์มือถือ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "ต้องการรหัสผ่านในการเชื่อมต่อกับ '%s'"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "ต้องการ PIN ปลดล็อค SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "ต้องการ PIN ปลดล็อค SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1004,25 +1059,25 @@ msgid ""
 msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PIN ของ SIM ก่อนที่จะใช้งานได้"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "รหัส PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "แสดงรหัส PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "ต้องการ PUK ปลดล็อค SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "ต้องการ PUK ปลดล็อค SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1030,35 +1085,42 @@ msgid ""
 msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PUK ของ SIM ก่อนที่จะใช้งานได้"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "รหัส PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "ตั้งรหัส PIN ใหม่:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "ป้อนรหัส PIN ที่ตั้งซ้ำอีกครั้ง:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "แสดงรหัส 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "ข้อมูลการเชื่อมต่อ"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "สร้างการเชื่อมต่อ DUN ไม่สำเร็จ: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1067,57 +1129,57 @@ msgstr ""
 "ที่อยู่ไอพีเป็นหมายเลขประจำเครื่องของคุณสำหรับอ้างถึงในเครือข่าย คลิกที่ปุ่ม \"เพิ่ม\" "
 "เพื่อเพิ่มที่อยู่ไอพี"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_ลบ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ไ_ม่สนใจเส้นทางเครือข่ายที่ได้รับมาแบบอัตโนมัติ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "ใ_ช้การเชื่อมต่อนี้เพื่อเก็บข้อมูลของตัวเครือข่ายเท่านั้น"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "ถ้าเปิดใช้ การเชื่อมต่อนี้จะไม่มีการใช้งานเป็นการเชื่อมต่อปริยาย"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "สร้าง…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "เลือกชนิดการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1128,213 +1190,273 @@ msgstr ""
 "เลือกชนิดของ VPN ที่คุณต้องการใช้สำหรับการเชื่อมต่อใหม่นี้ ถ้าชนิดของการเชื่อมต่อ VPN "
 "ที่คุณต้องการสร้างไม่มีอยู่ในรายชื่อนี้ ก็แปลว่าคุณอาจไม่ได้ติดตั้งปลั๊กอิน VPN ที่ถูกต้องไว้"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_บริการ:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "ที่อยู่บรอดแคสต์:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "การเชื่อมต่อฐาน:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "โห_มด:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "แ_ก้ไข"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "อินเทอร์เฟซ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "DNS แรก:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "ไบต์"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "การเชื่อมต่อฐาน:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "เปิดใช้เ_ครือข่าย"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "อัตโนมัติ"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "ปริยาย"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1345,437 +1467,530 @@ msgstr ""
 "ความสามารถนี้เรียกกันว่าการปลอม MAC (MAC cloning หรือ spoofing) ตัวอย่าง: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "หมายเลขฮาร์ดแวร์:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "อุปกรณ์ใดๆ"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ไม่สามารถปรับข้อมูลข้อมูลลับของการเชื่อมต่อเนื่องจากเกิดข้อผิดพลาดไม่ทราบสาเหตุ"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "ใช้การรักษาความปลอดภัย 802.1_X สำหรับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_ชื่อผู้ใช้:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_บริการ:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "แ_สดงรหัสผ่าน"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_รหัสผ่าน:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "อินเทอร์เฟซ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "อินเทอร์เฟซ:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "อินเทอร์เฟซ:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "ไม่ใช้"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "กำหนดเอง"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_พอร์ต:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_บริการ:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "หมายเลข MAC ฉบับ_จำลอง:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "ปริยาย"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "ไม่ใช้"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ที่อยู่บรอดแคสต์:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "ความเ_ร็ว:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "สื่อสาร_สองทางเต็มอัตรา"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "ไม่มี"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "คุณเชื่อมต่อกับเครือข่ายโยงสายแล้ว"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "ปลดล็อคอุปกรณ์นี้โดยอัตโนมัติ"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_ข้อมูลการเชื่อมต่อ"
+msgid "_Metered connection"
+msgstr "การเชื่อมต่อฐาน:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "เชื่อมต่อโดย_อัตโนมัติ"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1784,7 +1999,7 @@ msgstr ""
 "ที่อยู่ไอพีเป็นหมายเลขประจำเครื่องของคุณสำหรับอ้างถึงในเครือข่าย คลิกที่ปุ่ม \"เพิ่ม\" "
 "เพื่อเพิ่มที่อยู่ไอพี"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1792,128 +2007,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "อัตโนมัติ เฉพาะที่อยู่"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "เ_ชื่อมต่อ"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_บริการ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "อีเทอร์เน็ต (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "อัตโนมัติโดยกำหนด DNS เอง"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "เชื่อมภายใน"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "แบ่งปันให้เครื่องอื่น"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_วิธีการ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1923,32 +2141,33 @@ msgstr ""
 "ชื่อของลูกข่าย DHCP จะเปิดให้ผู้ดูแลเครือข่ายสามารถปรับแต่งค่าสำหรับเครื่องของคุณโดยเฉพาะได้ "
 "ถ้าคุณต้องการใช้ชื่อลูกข่าย DHCP ก็ป้อนได้ที่นี่"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "โดเมนที่จะใช้ในการเปิดหาที่อยู่จากชื่อโฮสต์ ใช้จุลภาคคั่นถ้าใช้โดเมนหลายโดเมน"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ชื่อลูกข่าย D_HCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "โดเมนที่_ค้นหา:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "เซิร์ฟเวอร์ _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1956,36 +2175,45 @@ msgstr ""
 "รายชื่อที่อยู่ไอพีของเซิร์ฟเวอร์โดเมนเนมที่จะใช้เปิดหาที่อยู่ของชื่อโฮสต์ "
 "ใช้จุลภาคคั่นระหว่างที่อยู่ของเซิร์ฟเวอร์ต่างๆ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "บังคับใช้ที่อยู่ IPv_4 สำหรับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 "เมื่อเชื่อมต่อกับเครือข่ายที่รองรับ IPv6 จะยอมเชื่อมต่อถ้าตั้งค่า IPv4 ไม่ผ่านแต่ตั้งค่า IPv6 ได้สำเร็จ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "เ_ส้นทาง…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "ปิดใช้งาน"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1995,766 +2223,875 @@ msgstr ""
 "รายชื่อที่อยู่ไอพีของเซิร์ฟเวอร์โดเมนเนมที่จะใช้เปิดหาที่อยู่ของชื่อโฮสต์ "
 "ใช้จุลภาคคั่นระหว่างที่อยู่ของเซิร์ฟเวอร์ต่างๆ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "บังคับใช้ที่อยู่ IPv_6 สำหรับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 "เมื่อเชื่อมต่อกับเครือข่ายที่รองรับ IPv4 จะยอมเชื่อมต่อถ้าตั้งค่า IPv6 ไม่ผ่านแต่ตั้งค่า IPv4 ได้สำเร็จ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Metric"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_นำเข้า"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "พื้นฐาน"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "เ_ลขหมาย:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "ชื่อเ_ครือข่าย:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "เปลี่ยน..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "เปิดใช้บริการ_ข้ามเครือข่ายถ้าออกนอกเครือข่ายเหย้า"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "แ_สดงรหัสผ่าน"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "การยืนยันตัวบุคคล"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "วิธีการที่อนุญาต:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "ตั้งค่า_วิธีการ…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "การบีบอัด"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "ใ_ช้การเข้ารหัสลับแบบ point-to-point (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_บังคับใช้การเข้ารหัสลับ 128 บิต"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ใช้ MPPE แบบเปลี่ยน_สถานะ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "เปิดรับการบีบอัดข้อมูลแบบ _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "เปิดรับการบีบอัดข้อมูลแบบ _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "ใช้การบีบอัดข้อมูลส่วน_หัว TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "การสะท้อนข้อมูล"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "ส่งแพ็กเก็ตสะ_ท้อนของ PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_วิธีการ:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "ไม่มี"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_วิธีการ:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "ขั้นสูง"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "เครือข่ายโยงสาย"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "การรักษาความ_ปลอดภัย:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "กุญแจ_ส่วนตัว:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "ตั้งค่า VPN ผิดพลาด"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "ตั้งค่า VPN ผิดพลาด"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "อีเทอร์เน็ต (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "การเชื่อมต่อฐาน:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 msgid "Ethernet"
 msgstr "อีเทอร์เน็ตอัตโนมัติ"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "หมายเลขฮาร์ดแวร์:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "หมายเลขฮาร์ดแวร์:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "_กำลังส่ง:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "_กำลังส่ง:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "อินเทอร์เฟซ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "อินเทอร์เฟซ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "หมายเลข MAC ฉบับ_จำลอง:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "เฉพาะกิจ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "_กำลังส่ง:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_อัตรา:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_ช่องสัญญาณ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ย่านความ_ถี่:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "วิธียืนยันตัวบุคคลที่เปิดใช้"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol รุ่นที่ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2763,439 +3100,478 @@ msgstr ""
 "โดยทั่วไปแล้ว เซิร์ฟเวอร์ PPP ของผู้ให้บริการจะรองรับวิธียืนยันตัวบุคคลทั้งหมด "
 "แต่ถ้าการเชื่อมต่อไม่สำเร็จ ก็ลองปิดการรองรับบางวิธีดู"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"ปลั๊กอิน VPN ไม่สามารถนำเข้าการเชื่อมต่อ VPN ได้อย่างถูกต้อง\n"
-"\n"
-"ข้อผิดพลาด: ไม่มีชนิดของบริการ VPN"
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "ไม่สามารถนำเข้าการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"แฟ้ม '%s' ไม่สามารถอ่านได้ หรือไม่มีข้อมูลการเชื่อมต่อ VPN ที่รู้จัก\n"
+"ปลั๊กอิน VPN ไม่สามารถนำเข้าการเชื่อมต่อ VPN ได้อย่างถูกต้อง\n"
 "\n"
-"ข้อผิดพลาด: %s"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
+"ข้อผิดพลาด: ไม่มีชนิดของบริการ VPN"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "เลือกแฟ้มที่จะนำเข้า"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "หมายเลขฮาร์ดแวร์:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "ส่งออกการเชื่อมต่อ VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ไม่สามารถตั้งต้นกล่องโต้ตอบแก้ไขการเชื่อมต่อ เนื่องจากความผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "ไม่สามารถสร้างการเชื่อมต่อรายการใหม่"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "ลบการเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "แน่ใจหรือไม่ว่าคุณต้องการลบการเชื่อมต่อ %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_การเชื่อมต่อ VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "เน็ตแมสก์"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "เกตเวย์"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "แก้ไข %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "แก้ไขการเชื่อมต่อไม่มีชื่อ"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_ชื่อการเชื่อมต่อ:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "เกิดข้อผิดพลาดขณะตั้งต้นเครื่องมือแก้ไข"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "เครื่องมือแก้ไขการเชื่อมต่อไม่พบข้อมูลบางอย่างที่ต้องใช้ (ไม่พบแฟ้ม .ui)"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "บันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ยืนยันตัวบุคคลเพื่อบันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "ไม่สามารถสร้างการเชื่อมต่อรายการใหม่"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "ไม่สามารถแก้ไขการเชื่อมต่อ"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "เกิดข้อผิดพลาดขณะสร้างกล่องโต้ตอบแก้ไขการเชื่อมต่อ"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "เกิดข้อผิดพลาดขณะตั้งต้นเครื่องมือแก้ไข"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในการยืนยันตัวตนแบบ EAP"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_ชื่อการเชื่อมต่อ:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_ส่งออก"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ไม่เคยใช้"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "เดี๋ยวนี้"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d นาทีที่แล้ว"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ชั่วโมงที่แล้ว"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d วันที่แล้ว"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d เดือนที่แล้ว"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ปีที่แล้ว"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ชื่อ"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ใช้ล่าสุด"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "แก้ไขการเชื่อมต่อที่เลือก"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "ยืนยันตัวบุคคลเพื่อแก้ไขการเชื่อมต่อที่เลือก"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "ลบการเชื่อมต่อที่เลือก"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "ยืนยันตัวบุคคลเพื่อลบการเชื่อมต่อที่เลือก"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ไม่รองรับการเชื่อมต่อบรอดแบนด์มือถือชนิดนี้"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "ไม่ทราบว่าจะสร้างการเชื่อมต่อ '%s' อย่างไร"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "เกิดข้อผิดพลาดขณะสร้างการเชื่อมต่อ"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "ไม่ทราบว่าจะสร้างการเชื่อมต่อ '%s' อย่างไร"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "ไม่พบการเชื่อมต่อที่มี UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "การเชื่อมต่อเครือข่าย"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "เพิ่มการเชื่อมต่อ VPN ใหม่"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "การรักษาความปลอดภัย 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย Wi-Fi"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "ใช้การรักษาความปลอดภัย 802.1_X สำหรับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "หาอุปกรณ์บลูทูทไม่พบ"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "เปิดใช้เ_ครือข่าย"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "เครือข่ายไร้สาย"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "DNS แรก:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
@@ -3203,34 +3579,39 @@ msgstr "การเชื่อมต่อโยงสาย %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ DSL"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ DSL"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "อินเทอร์เฟซ:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "การเชื่อมต่อ DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3240,57 +3621,56 @@ msgstr ""
 "ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "ไม่ใช้"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "อีเทอร์เน็ต (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "หมายเลข MAC ฉบับ_จำลอง:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "ปริยาย"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3301,184 +3681,188 @@ msgstr ""
 "ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ Wi-Fi"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv4"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "อัตโนมัติ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "อัตโนมัติ (VPN) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "อัตโนมัติ เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "อัตโนมัติ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "อัตโนมัติ (PPPoE) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "อัตโนมัติ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "อัตโนมัติ (DHCP) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "เชื่อมภายในเท่านั้น"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "เซิร์ฟเวอร์ _DNS เพิ่มเติม:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "โดเมน_ค้นหาเพิ่มเติม:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "แก้ไขเส้นทาง IPv4 สำหรับ %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "ตั้งค่า IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "อัตโนมัติ ใช้ DHCP เท่านั้น"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "แก้ไขเส้นทาง IPv6 สำหรับ %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "ตั้งค่า IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ DSL"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "การเชื่อมต่อ DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับบรอดแบนด์มือถือ"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ไม่รองรับการเชื่อมต่อบรอดแบนด์มือถือชนิดนี้"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "เลือกชนิดของผู้ให้บริการบรอดแบนด์มือถือ"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3486,90 +3870,86 @@ msgid ""
 msgstr ""
 "เลือกเทคโนโลยีที่ผู้ให้บริการบรอดแบนด์มือถือของคุณใช้ ถ้าคุณไม่แน่ใจ ขอให้สอบถามผู้ให้บริการของคุณ"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยีที่มี _GSM เป็นพื้นฐาน (คือ GPRS, EDGE, UMTS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยีที่มี C_DMA เป็นพื้นฐาน (คือ 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ไม่มี"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "แก้ไขวิธียืนยันตัวบุคคลของ PPP สำหรับ %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "ตั้งค่า PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ PPP"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
@@ -3577,11 +3957,11 @@ msgstr "การเชื่อมต่อโยงสาย %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
@@ -3589,59 +3969,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "ไม่ได้เชื่อมกับเครือข่าย"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv4"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "การเชื่อมต่อ %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ VPN"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "หาปลั๊กอินบริการ VPN สำหรับ '%s' ไม่พบ"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "หาปลั๊กอินบริการ VPN สำหรับ '%s' ไม่พบ"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ VPN"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "หาปลั๊กอินบริการ VPN สำหรับ '%s' ไม่พบ"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "การเชื่อมต่อ %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "เลือกชนิดการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3651,7 +4031,7 @@ msgstr ""
 "เลือกชนิดของ VPN ที่คุณต้องการใช้สำหรับการเชื่อมต่อใหม่นี้ ถ้าชนิดของการเชื่อมต่อ VPN "
 "ที่คุณต้องการสร้างไม่มีอยู่ในรายชื่อนี้ ก็แปลว่าคุณอาจไม่ได้ติดตั้งปลั๊กอิน VPN ที่ถูกต้องไว้"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3660,7 +4040,7 @@ msgstr ""
 "ตัวเลือกนี้จะล็อคการเชื่อมต่อนี้เข้ากับ access point (AP) ที่ระบุโดย BSSID ที่ป้อนนี้ ตัวอย่าง: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3670,98 +4050,96 @@ msgstr ""
 "ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "อุปกรณ์ใดๆ"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP กุญแจ 40/128 บิต (ฐานสิบหก หรือ ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP แบบผันแปร (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 เอนเทอร์ไพรส์"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย Wi-Fi; ไม่ได้ตั้งค่า Wi-Fi ไว้"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "การรักษาความปลอดภัยเครือข่ายไร้สาย"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "แ_ทนที่"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "คุณต้องการจะแทนที่ %s ด้วยการเชื่อมต่อ VPN ที่คุณกำลังจะบันทึกนี้หรือไม่?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "ไม่สามารถส่งออกการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3772,486 +4150,467 @@ msgstr ""
 "\n"
 "ข้อผิดพลาด: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "ส่งออกการเชื่อมต่อ VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_ปลดล็อค"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "ปลดล็อคอุปกรณ์นี้โดยอัตโนมัติ"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "ข้อมูลการเชื่อมต่อ"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "การเชื่อมต่อเครือข่ายที่เปิดทำงานอยู่"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "เลือกใบรับรอง CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "กุญแจ_ส่วนตัว:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "เลือกใบรับรอง CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_ใบรับรองของผู้ใช้:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "บรอดแบนด์มือถือของคุณถูกตั้งค่าไว้ดังนี้:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "อุปกรณ์ของคุณ:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "ผู้ให้บริการของคุณ:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "แผนของคุณ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"กำลังจะเชื่อมต่อไปยังผู้ให้บริการบรอดแบนด์มือถือของคุณโดยใช้ค่าต่างๆ ที่คุณเลือกไว้ "
-"ถ้าการเชื่อมต่อล้มเหลว หรือคุณไม่สามารถเข้าถึงทรัพยากรต่างๆ ในเครือข่ายได้ "
-"ก็กรุณาตรวจสอบการตั้งค่าของคุณใหม่ การแก้ไขค่าตั้งบรอดแบนด์มือถือ ทำได้โดยเลือก "
-"\"การเชื่อมต่อเครือข่าย\" จากเมนู \"ระบบ\" >> \"ปรับแต่งพื้นโต๊ะ\""
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "ไม่มีประเทศของฉันในรายชื่อ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ไม่ระบุ"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "เ_ลือกแผนของคุณ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "เลือก _APN (Access Point Name) ของแผน:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"คำเตือน: การเลือกแผนผิดอาจทำให้เกิดปัญหาเรื่องค่าบริการในบัญชีบรอดแบนด์ของคุณ "
-"หรืออาจทำให้เชื่อมต่อไม่ได้\n"
-"\n"
-"ถ้าคุณไม่แน่ใจเกี่ยวกับแผนของคุณ กรุณาสอบถามผู้ให้บริการของคุณเกี่ยวกับ APN สำหรับแผนที่คุณใช้"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "เลือกแผนการจ่ายเงินของคุณ"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "แผนที่ฉันใช้ไม่มีในรายชื่อ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "เลือกผู้ให้บริการของคุณจาก_รายชื่อ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ผู้ให้บริการ"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "ผู้ให้บริการ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "เลือกผู้ให้บริการของคุณ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "รายชื่อประเทศหรือภูมิภาค:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "ประเทศหรือภูมิภาค"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "ไม่มีประเทศของฉันในรายชื่อ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "เลือกประเทศหรือภูมิภาคของผู้ให้บริการของคุณ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ติดตั้งอุปกรณ์ GSM แล้ว"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ติดตั้งอุปกรณ์ CDMA แล้ว"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "อุปกรณ์ใดๆ"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "เครื่องมือช่วยนี้จะช่วยคุณตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือกับเครือข่ายมือถืออย่างง่ายดาย"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "คุณจะต้องใช้ข้อมูลต่อไปนี้:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "ผู้ให้บริการบรอดแบนด์ของคุณ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ชื่อแผนการจ่ายเงินที่คุณใช้"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(ในบางกรณี) APN (Access Point Name) สำหรับแผนการจ่ายเงินบรอดแบนด์ที่คุณใช้"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "สร้างการเชื่อมต่อสำหรับอุปกรณ์บรอดแบนด์มือถือ_นี้:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "อุปกรณ์ใดๆ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือ"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "ประเทศหรือภูมิภาค"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "เลือกประเทศหรือภูมิภาคของผู้ให้บริการของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "เลือกผู้ให้บริการของคุณจาก_รายชื่อ:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยี CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "เลือกผู้ให้บริการของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "เ_ลือกแผนของคุณ:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "เลือก _APN (Access Point Name) ของแผน:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"คำเตือน: การเลือกแผนผิดอาจทำให้เกิดปัญหาเรื่องค่าบริการในบัญชีบรอดแบนด์ของคุณ "
+"หรืออาจทำให้เชื่อมต่อไม่ได้\n"
+"\n"
+"ถ้าคุณไม่แน่ใจเกี่ยวกับแผนของคุณ กรุณาสอบถามผู้ให้บริการของคุณเกี่ยวกับ APN สำหรับแผนที่คุณใช้"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "เลือกแผนการจ่ายเงินของคุณ"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "บรอดแบนด์มือถือของคุณถูกตั้งค่าไว้ดังนี้:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "อุปกรณ์ของคุณ:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "ผู้ให้บริการของคุณ:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "แผนของคุณ:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"กำลังจะเชื่อมต่อไปยังผู้ให้บริการบรอดแบนด์มือถือของคุณโดยใช้ค่าต่างๆ ที่คุณเลือกไว้ "
+"ถ้าการเชื่อมต่อล้มเหลว หรือคุณไม่สามารถเข้าถึงทรัพยากรต่างๆ ในเครือข่ายได้ "
+"ก็กรุณาตรวจสอบการตั้งค่าของคุณใหม่ การแก้ไขค่าตั้งบรอดแบนด์มือถือ ทำได้โดยเลือก "
+"\"การเชื่อมต่อเครือข่าย\" จากเมนู \"ระบบ\" >> \"ปรับแต่งพื้นโต๊ะ\""
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(ไม่มี)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "ใ_บรับรอง CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "ไม่ทราบ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "เลือกใบรับรอง CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_ใบรับรองของผู้ใช้:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_ปลดล็อค"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_ถามรหัสผ่านทุกครั้ง"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "ต้องการรหัสผ่านในการเชื่อมต่อกับ '%s'"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_รหัสผ่าน:"
+msgid "Sh_ow passwords"
+msgstr "แ_สดงรหัสผ่าน"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_รหัสผ่าน:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "แ_สดงรหัสผ่าน"
+msgid "_Secondary Password:"
+msgstr "_รหัสผ่าน:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_รหัสผ่าน:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ตัดการเชื่อมต่อ"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ไม่มี"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP แบบผันแปร (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_สร้าง"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "ต้องใช้รหัสผ่านหรือกุญแจเข้ารหัสลับในการเข้าใช้เครือข่ายไร้สาย '%s'"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ต้องยืนยันตัวบุคคลกับเครือข่ายไร้สาย"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "เครือข่ายไร้สายต้องการการยืนยันตัวบุคคล"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "สร้างเครือข่ายไร้สายใหม่"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "เครือข่ายไร้สายรายการใหม่"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ป้อนชื่อเครือข่ายไร้สายที่ต้องการสร้าง"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "เครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "ป้อนชื่อและรายละเอียดการรักษาความปลอดภัยของเครือข่ายไร้สายที่ซ่อนอยู่ที่คุณต้องการเชื่อมต่อ"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "การเชื่อม_ต่อ:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "อุปกรณ์ไ_ร้สาย:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "ฉันไม่เห็นชื่อผู้ให้บริการของฉันในรายชื่อ และต้องการป้อนเ_อง:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "ผู้ให้บริการ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "รายชื่อประเทศหรือภูมิภาค:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "ประเทศหรือภูมิภาค"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "โยงสาย"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4261,17 +4620,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_ชื่อเครือข่าย:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "การเชื่อม_ต่อ:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "อุปกรณ์ไ_ร้สาย:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4279,422 +4662,473 @@ msgstr ""
 "โปรแกรมนี้เป็นองค์ประกอบหนึ่งของ NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "โปรแกรมนี้มิได้มุ่งหวังให้เรียกในบรรทัดคำสั่ง แต่จะทำงานในเดสก์ท็อป GNOME"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ไม่ได้เปิดใช้"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ไม่ได้ลงทะเบียน"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "เครือข่ายเหย้า (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "เครือข่ายเหย้า"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "กำลังค้นหา"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "การลงทะเบียนถูกปฏิเสธ"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s ข้ามเขต)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ข้ามเขต)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "เครือข่ายบริการข้ามเขต (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "เครือข่ายบริการข้ามเขต"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "รหัส PIN สำหรับการ์ด SIM '%s' ใน '%s'"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "ต้องใช้รหัส PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ต้องใช้รหัส PIN สำหรับอุปกรณ์บรอดแบนด์มือถือ"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "ข้ามเขต"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "การเชื่อมต่อ %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "ใบรับรองแบบ DER หรือ PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "กุญแจส่วนตัวแบบ DER, PEM, หรือ PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
-msgstr ""
+#: src/wireless-security/eap-method.c:370
+#, fuzzy
+msgid "selected CA certificate file does not exist"
+msgstr "เลือกแฟ้มใบรับรอง CA"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "เลือกแฟ้ม PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "แฟ้ม PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ทุกแฟ้ม"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "นิรนาม"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "ยืนยันตัวบุคคล"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "ทั้งสองอย่าง"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "ชื่อในระบบแบบนิ_รนาม:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "แ_ฟ้ม PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "การยืนยันตัวบุคคลชั้นใ_น:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "เปิดรับการใช้ PAC อัตโนมัติ"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "เลือกใบรับรองจากองค์กรออกใบรับรอง..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "รุ่น 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "รุ่น 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "ใ_บรับรอง CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "รุ่_นของ PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "แสดงวลีรหัสผ่าน"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-#, fuzzy
-msgid "no CA certificate selected"
-msgstr "ปิดคำเตือนใบรับรอง CA"
-
-#: ../src/wireless-security/eap-method-tls.c:319
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "selected CA certificate file does not exist"
-msgstr "เลือกแฟ้มใบรับรอง CA"
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_ชื่อในระบบ:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "TLS ผ่านทันเนล"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP ที่มีการปกป้อง (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "การ_ยืนยันตัวบุคคล:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (ปริยาย)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ระบบเปิด"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ใช้กุญแจร่วมกัน"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (ปริยาย)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "กุญแ_จ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "แ_สดงกุญแจ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_ดัชนี WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "ช_นิด:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (ปริยาย)"
+
+#~ msgid "Ignored"
+#~ msgstr "ไม่ใช้"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "ไม่สามารถปรับข้อมูลข้อมูลลับของการเชื่อมต่อเนื่องจากเกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_ข้อมูลการเชื่อมต่อ"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "ไม่สามารถนำเข้าการเชื่อมต่อ VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "แฟ้ม '%s' ไม่สามารถอ่านได้ หรือไม่มีข้อมูลการเชื่อมต่อ VPN ที่รู้จัก\n"
+#~ "\n"
+#~ "ข้อผิดพลาด: %s"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "การเชื่อมต่อเครือข่ายที่เปิดทำงานอยู่"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "เลือกใบรับรองจากองค์กรออกใบรับรอง..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "ใ_บรับรอง CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "แอพเพล็ต NetworkManager"
@@ -4734,15 +5168,6 @@ msgstr "ช_นิด:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "ตกลงแ_ลกเปลี่ยนอัตโนมัติ"
 
@@ -4850,12 +5275,6 @@ msgstr "ช_นิด:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS ที่สอง:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS ที่สาม:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "เปิดใช้บรอดแบนด์มือถือ WiMA_X"
 
@@ -4901,12 +5320,6 @@ msgstr "ช_นิด:"
 #~ msgid "_Save..."
 #~ msgstr "_บันทึก..."
 
-#~ msgid "_Import"
-#~ msgstr "_นำเข้า"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "เชื่อมต่อโดย_อัตโนมัติ"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "เปิดให้ผู้ใช้ทุกคนสามารถใช้ได้"
 
@@ -4956,9 +5369,6 @@ msgstr "ช_นิด:"
 #~ msgid "Error: %s"
 #~ msgstr "ความผิดพลาด: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "สร้างการเชื่อมต่อ DUN ไม่สำเร็จ: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "โทรศัพท์ของคุณพร้อมใช้งานแล้ว!"
 
@@ -5020,11 +5430,6 @@ msgstr "ช_นิด:"
 #~ msgid "_Authentication:"
 #~ msgstr "การ_ยืนยันตัวบุคคล:"
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "อิสริยะ ไพรีพ่ายฤทธิ์ <markpeak@gmail.com>\n"
-#~ "เทพพิทักษ์ การุญบุญญานันท์ <thep@linux.thai.net>"
-
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
@@ -5230,9 +5635,6 @@ msgstr "ช_นิด:"
 #~ msgid "Select the Private Key File"
 #~ msgstr "เลือกแฟ้มกุญแจส่วนตัว"
 
-#~ msgid "Show passphrase"
-#~ msgstr "แสดงวลีรหัสผ่าน"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "เ_ชื่อถือเครือข่ายไร้สายนี้เสมอ"
 
diff --git a/po/tr.po b/po/tr.po
index ee308489..740deda8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-applet/"
-"issues\n"
-"POT-Creation-Date: 2019-05-06 16:46+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2019-05-07 09:45+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Generator: Gtranslator 3.32.0\n"
 "X-POOTLE-MTIME: 1434872144.000000\n"
 
-#: nm-applet.desktop.in:3 src/applet.c:3198 src/applet-dialogs.c:737
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
 #: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Ağ"
@@ -107,7 +107,6 @@ msgstr ""
 "kullanılır."
 
 #: org.gnome.nm-applet.gschema.xml.in:31
-#| msgid "Disable Wi-Fi Create"
 msgid "Disable WiFi Create"
 msgstr "WiFi Oluşturmayı devre dışı bırak"
 
@@ -457,117 +456,117 @@ msgstr "aygıt yönetilmiyor"
 msgid "No network devices available"
 msgstr "Ağ aygıtı bulunamadı"
 
-#: src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN Bağlantıları"
 
-#: src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "VPNʼyi _Yapılandır…"
 
-#: src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "VPN bağlantısı _ekle…"
 
-#: src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "Ağ Yöneticisi çalışmıyor…"
 
-#: src/applet.c:1623 src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Ağ yönetimi etkin değil"
 
 #. 'Enable Networking' item
-#: src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Ağ Yönetimini Etkinleştir"
 
 #. 'Enable Wi-Fi' item
-#: src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "_Kablosuz Bağlantıyı Etkinleştir"
 
 #. 'Enable Mobile Broadband' item
-#: src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil Geniş Bant Ağları Etkinleştir"
 
 #. Toggle notifications item
-#: src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_Bildirimleri Etkinleştir"
 
 #. 'Connection Information' item
-#: src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Bağlantı _Bilgileri"
 
 #. 'Edit Connections...' item
-#: src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "Bağlantıları Düzenle…"
 
-#: src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Hakkında"
 
-#: src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "Şimdi “%s” bağlantısına bağlandınız."
 
-#: src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Bağlı değil"
 
-#: src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Ağ bağlantısı kesildi."
 
-#: src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "“%s” ağ bağlantısı hazırlanıyor…"
 
-#: src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "“%s” ağ bağlantısı için kimlik doğrulama gerekiyor…"
 
-#: src/applet.c:2557 src/applet-device-bt.c:125 src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "“%s” için bir ağ adresi isteniyor…"
 
-#: src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "“%s” ağ bağlantısı etkin"
 
-#: src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "“%s” VPN bağlantısı başlatılıyor…"
 
-#: src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "“%s” VPN bağlantısı için kimlik doğrulama gerekiyor…"
 
-#: src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "“%s” için VPN adresi isteniyor…"
 
-#: src/applet.c:2642
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN bağlantısı etkin"
 
-#: src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Ağ bağlantısı yok"
 
-#: src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Programcığı"
 
@@ -960,7 +959,6 @@ msgid "Hotspot"
 msgstr "Etkin Nokta"
 
 #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
-#| msgid "Password:"
 msgid "Password"
 msgstr "Parola"
 
@@ -1106,16 +1104,16 @@ msgstr "Yeni PIN kodunu tekrar girin:"
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK kodlarını göster"
 
-#: src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "Bağlantının VPN ayarı yok"
 
-#: src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "Bağlantı VPN kullanıcı arayüzüne yazılamadı: %s (%d)"
 
-#: src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "Bağlantı VPN kullanıcı arayüzüne yazılamadı: tamamlanmamış yazım"
 
@@ -3878,12 +3876,12 @@ msgstr ""
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Sağlayıcım C_DMA-tabanlı teknoloji kullanıyor (örn.: 1xRTT, EVDO)"
 
-#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:147
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
 #: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:144
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
 #: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
@@ -4205,32 +4203,28 @@ msgstr "%s _sertifikası"
 msgid "My country is not listed"
 msgstr "Ülkem listede değil"
 
-#: src/libnma/nma-mobile-wizard.c:252 src/libnma/nma-mobile-wizard.c:284
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
 #: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Listelenmemiş"
 
-#: src/libnma/nma-mobile-wizard.c:484 src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "Planım listede yok…"
 
-#: src/libnma/nma-mobile-wizard.c:644 src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Sağlayıcı"
 
-#: src/libnma/nma-mobile-wizard.c:932 src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Ülke veya bölge"
-
-#: src/libnma/nma-mobile-wizard.c:1016 src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Kurulan GSM aygıtı"
 
-#: src/libnma/nma-mobile-wizard.c:1019 src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Kurulan CDMA aygıtı"
 
-#: src/libnma/nma-mobile-wizard.c:1225 src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Herhangi bir aygıt"
 
@@ -4262,23 +4256,24 @@ msgstr "Geniş bant ödeme planınızın adı"
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(bazı durumlarda) Geniş bant ödeme planı APNʼsi (Erişim Noktası Adı)"
 
-#: src/libnma/nma-mobile-wizard.ui:145 src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Bu mobil _geniş bant aygıtı için bir bağlantı oluştur:"
 
-#: src/libnma/nma-mobile-wizard.ui:173 src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobil Geniş Bant Bağlantı Ayarla"
 
-#: src/libnma/nma-mobile-wizard.ui:191 src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Ülke veya Bölge Listesi:"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Ülke veya bölge"
 
-#: src/libnma/nma-mobile-wizard.ui:230 src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "Sağlayıcınızın Ülkesini veya Bölgesini Seçin"
 
-#: src/libnma/nma-mobile-wizard.ui:245 src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "_Listeden sağlayıcınızı seçin:"
 
@@ -4551,6 +4546,14 @@ msgstr "Sağlayıcımı bulamıyorum ve _elle girmek istiyorum:"
 msgid "Provider:"
 msgstr "Sağlayıcı:"
 
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Ülke veya Bölge Listesi:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Ülke veya bölge"
+
 #: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kablolu"
diff --git a/po/ug.po b/po/ug.po
index f2a39c1d..435be9ff 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2013-02-10 11:32+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -18,49 +19,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "تور"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "تور باغلىنىشلىرىڭىزنى باشقۇرۇڭ"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "تور باغلىنىشلىرى"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "ئاكتىپ تور باغلىنىشلىرى"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "تور باغلىنىش تەڭشەكلىرىڭىزنى باشقۇرۇڭ ۋە ئۆزگەرتىڭ"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "باغلىنىش ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "بىر تورغا باغلىنىۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى "
 "TRUE غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "باغلىنىش ئۈزۈلگەنلىك ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "بىر تور باغلىنىشىنى ئۈزۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ "
 "تاللاشنى TRUE غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "ۋ پ ن(VPN) ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -68,50 +78,51 @@ msgstr ""
 "ۋ پ ن(VPN) تورىغا  باغلىنىۋاتقاندا ياكى باغلىنىش ئۈزۈلۈۋاتقاندا "
 "ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "تور ئىشلىتىلىشچان ئۇقتۇرۇشلىرىنى چەكلە"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "ئەگەر بۇ true قىلىپ بەلگىلەنسە، ئىشلەتكىلى بولىدىغان Wi-Fi بار بولغاندا "
 "چىقىرىدىغان ئۇقتۇرۇش ئىناۋەتسىز قىلىنىدۇ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "تامغا"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "تەڭشەكلەرنىڭ يېڭى بىر نۇسخىغا كۆچۈش-كۆچۈرمەسلىكنى بەلگىلەش ئۈچۈن ئىشلىتىلىدۇ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "سىمسىز تور Wi-Fi قۇرۇشنى تاقا"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "قوللانچاقلارنى ئىشلەتكەندە adhoc تورلىرىنى قۇرماسلىقنى ئىستىسىڭىز بۇ "
 "تاللاشنى TRUE غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -119,7 +130,7 @@ msgstr ""
 "EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز "
 "بۇنى true غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -127,131 +138,144 @@ msgstr ""
 "EAP دىكى كىملىك دەلىللەشنىڭ ئىككىنچى باسقۇچىدىكى CA گۇۋاھنامىسىنىڭ "
 "ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "تور باشقۇرغۇچ"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "تور باغلىنىشى يوق"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager قوللانچاق"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 #, fuzzy
 msgid "C_onnect"
 msgstr "باغلاندى"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "تور ئاتى(_N)"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "باغلىنىشنى قوشۇش/ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "نامەلۇم خاتالىق"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "باغلىنىش مەغلۇپ بولدى"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "ئۈسكۈنە ئۈزۈش مەغلۇپ بولدى"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "ئۈزۈش مەغلۇپ بولدى"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "باغلىنىشنى ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "بۇ ئۇچۇرنى قايتا كۆرسەتمە"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -261,7 +285,7 @@ msgstr ""
 "\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈزۈلۈپ قالدى، چۈنكى تور باغلىنىشى ئۈزۈلدى."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -271,7 +295,7 @@ msgstr ""
 "\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى تور باغلىنىشى ئۈزۈلدى."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -280,7 +304,7 @@ msgstr ""
 "\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى بىنورمال توختىدى."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -291,7 +315,7 @@ msgstr ""
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ئىناۋەتسىز "
 "سەپلىمىگە قايتتى."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -300,7 +324,7 @@ msgstr ""
 "\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى باغلىنىش ۋاقتى ئېشىپ كەتتى."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -310,7 +334,7 @@ msgstr ""
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ۋاقتىدا "
 "باشلانمىدى."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -320,7 +344,7 @@ msgstr ""
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمەت باشلاش مەغلۇپ "
 "بولدى."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -330,7 +354,7 @@ msgstr ""
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى ئىناۋەتلىك VPN ئىم "
 "ھۆججەتلىرى(secret) يوق."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -340,7 +364,7 @@ msgstr ""
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN ئىم ھۆججەتلىرى(secret) "
 "ئىناۋەتسىز."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -349,7 +373,7 @@ msgstr ""
 "\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -360,19 +384,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "ۋ پ ن (VPN) باغلىنىشى مۇۋەپپەقىيەتلىك بولدى.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "ۋ پ ن(VPN) كىرىش ئۇچۇرى"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "ۋ پ ن(VPN) باغلىنىشى مەغلۇپ بولدى"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -386,7 +410,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -399,561 +423,586 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "ئۈسكۈنە تەييارلانمىدى(قۇيما دېتال كەم)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ئۈسكۈنە تەييارلانمىدى"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ئۈزۈلدى"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "ئۈز"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ئۈسكۈنە باشقۇرۇلمىدى"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "تور ئۈسكۈنىسى يوق"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "ۋ پ ن(VPN) باغلىنىشلىرى(_V)"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "ۋ پ ن(VPN) نى سەپلە(_C)…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "ۋ پ ن(VPN) باغلىنىشلىرى(_V)"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "تور باشقۇرغۇچ ئىجرا قىلىنمايۋاتىدۇ…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "تور باغلىنىشى چەكلەنگەن"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "تور ئۇلاشنى قوزغات(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "كۆچمە كەڭ بەلۋاغنى ئىناۋەتلىك قىل(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "ئۇقتۇرۇشلارنى قوزغات(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "باغلىنىش ئۇچۇرلىرى(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "باغلىنىشلارنى تەھرىرلە…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "سىز ھازىر ‹%s› گە باغلاندىڭىز."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "ئۈزۈلدى"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "تور باغلىنىشى ئۈزۈلگەن ئىدى."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "‹%s› تور باغلىنىشى تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "تور باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەكلىك…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "‹%s› ئۈچۈن بىر تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "‹%s› تور باغلىنىشى ئاكتىپ"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› باشلىنىۋاتىدۇ"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەكلىك..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "‹%s› ئۈچۈن بىر VPN ئادرېسى ئىلتىماس قىلىۋاتىدۇ..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "تور باغلىنىشى يوق"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager قوللانچاق"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "خاتا PUK كودى؛ تەمىنلىگۈچىڭىز بىلەن كۆرۈشۈڭ."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "خاتا PIN كودى؛ تەمىنلىگۈچىڭىز بىلەن كۆرۈشۈڭ."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "قۇلۇپسىزلاش كودى ئەۋەتىۋاتىدۇ..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "كۆچمە كەڭ بەلۋاغ(%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "كۆچمە كەڭ بەلۋاغ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "ئىشلەتكىلى بولىدۇ"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "باغلىنىش تۇرغۇزۇلدى"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "سىز ھازىر يېڭى كۆچمە كەڭ بەلۋاغقا باغلاندىڭىز."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "كۆچمە كەڭ بەلۋاغ تورى."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "سىز ھازىر ئائىلە تورىغا خەتلەتتىڭىز."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "سىز ھازىر كەزمە تورغا خەتلەتتىڭىز."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ھازىر كۆچمە كەڭ بەلۋاغ تورىغا باغلاندىڭىز."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› غا تەييارلىنىۋاتىدۇ..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› نى سەپلەۋاتىدۇ..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەك..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ئاپتوماتىك Ethernet"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ئېزېرنېت (Ethernet) تورى"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "سىز ھازىر ئېزېرنېت (Ethernet) تورىغا باغلاندىڭىز."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› غا تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› نى سەپلەۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› ئۈچۈن كىملىك دەلىللەش زۆرۈر…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "‹%s› ئۈچۈن ئېزېرنېت (Ethernet) تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL دەلىللەش"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(يوق)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "يېڭى باغلىنىش قوشۇش مەغلۇپ بولدى"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "سىمسىز(Wi-Fi) تورلار (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "سىمسىز(Wi-Fi) تور (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "سىمسىز(Wi-Fi) تورلار"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "سىمسىز(Wi-Fi) تور ئىناۋەتسىز قىلىنغان"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 "سىمسىز(Wi-Fi) تور قاتتىق دېتالنىڭ ئۈزچاتىدا ئارقىلىق ئىناۋەتسىز قىلىنغان"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "تېخىمۇ كۆپ تور"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "سىمسىز(Wi-Fi) تورلارنى ئىشلەتكىلى بولىدۇ"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "سىمسىز(Wi-Fi) تورغا باغلىنىش ئۈچۈن تور تىزىملىكىنى ئىشلەتسۇن"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "سىز ھازىر سىمسىز(Wi-Fi) تور ‹%s› غا باغلاندىڭىز."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› غا تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› نى سەپلەۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئۈچۈن كىملىك دەلىللەش زۆرۈر…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "‹%s› ئۈچۈن بىر سىمسىز(Wi-Fi) تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئاكتىپ: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "باغلىنىشنى ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "باغلىنىش ئۇچۇرلىرىنى كۆرسەتكەندە خاتالىق چىقتى:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "دىنامىكىلىق WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "ئادرېسلار"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "يوق"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (كۆڭۈلدىكى)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u مېگابايت/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP ئادرېسى"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "رادىئو ئادرېسى"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "تارماق تور ماسكىسى"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "بىرىنچى DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ئىككىنچى DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ئۈچىنچى DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "ئادەتتىكى"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "ئارايۈز"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "قاتتىق دېتال ئادرېسى"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "قوزغاتقۇچ"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "سۈرئەت"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "بىخەتەرلىك:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "كۆڭۈلدىكى Route"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "پەرۋا قىلمىدى"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "ئىم:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN تىپى"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN ئۆتكىلى"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN ئىشلەتكۈچى ئاتى"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN لەۋھەسى"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "ئاساسىي باغلىنىش"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "نامەلۇم"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "ئىناۋەتلىك ئاكتىپ باغلىنىشلار تېپىلدى!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -961,17 +1010,21 @@ msgstr ""
 "نەشر ھوقۇقىغا ئىگە © 2005-2008 Novell شىركىتى\n"
 "ۋە باشقا جامائەت تۆھپىكارلىرى ۋە تەرجىمانلار"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "تور ئۈسكۈنىلىرىڭىزنى ۋە باغلىنىشلارنى باشقۇرىدىغان ئۇقتۇرۇش رايونى قوللانچىقى"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager تور بېتى"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -979,33 +1032,33 @@ msgstr ""
 "تور باشقۇرغۇچ قوللانچاق بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى "
 "تېپىلمىدى)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "بايلىق كەمچىل"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "كۆچمە كەڭ بەلۋاغ تور ئىمى"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "‹%s› كە باغلىنىش ئۈچۈن بىر ئىمغا ئېھتىياجلىق."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "ئىم:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN قۇلۇپسىزلاش كېرەك"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN قۇلۇپسىزلاش كېرەك"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1015,25 +1068,25 @@ msgstr ""
 "كېرەك."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN نومۇرى:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "PIN نومۇرىنى كۆرسەت"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK قۇلۇپسىزلاش كېرەك"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK قۇلۇپسىزلاش كېرەك"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1043,35 +1096,42 @@ msgstr ""
 "كېرەك."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK نومۇرى:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "يېڭى PUK نومۇرى:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "يېڭى PUK نومۇرىنى يەنە كىرگۈزۈڭ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "باغلىنىش ئۇچۇرلىرى"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "DUN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1080,59 +1140,59 @@ msgstr ""
 "IP ئادرېسلىرى كومپيۇتېرىڭىزنى توردا كۆرسىتىپ بېرىدىغان بەلگە. \"قوش\" "
 "كۇنۇپكىسىنى چېكىپ بىر IP ئادرېسى قوشۇڭ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "ئۆچۈر(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "ئاپتوماتىك ئېرىشكەن route لارنى نەزەرگە ئالمىسۇن(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 "-پەقەت بۇ سىم ئۇلانغان سىمدا تورنى زىيارەت قىلغاندا، ئاندىن بۇ سىمنى "
 "ئىشلىتىدۇ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 "قوزغىتىلغاندا، بۇ باغلىنىش مەڭگۈ كۆڭۈلدىكى تور باغلىنىشى قىلىپ قوللىنالمايدۇ."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "قۇر…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "باغلىنىش تىپىنى تاللاڭ"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1145,85 +1205,100 @@ msgstr ""
 "سىزنىڭ VPN قىستۇرمىسىنى ئورناتمىغانلىقىڭىزنى ياكى توغرا ئورناتمىغانلىقىڭىزنى "
 "بىلدۈرىدۇ."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "مۇلازىمەت(_S)"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Round-robin"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "ئاكتىپ زاپاسلاش"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "ئاڭلىتىش"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "ماسلىشىشچان تارقىتىش يۈكىنى تەقسىملەش"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "ماسلىشىشچان يۈك تەقسىملەش"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (تەۋسىيە قىلىنىدۇ)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "كېپىللىك قىلىنغان باغلىنىش(_C)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "شەكىل(_O):"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "كۆزىتىش چاستوتىسى (_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "ئارايۈز ئاتى(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "ئۇلانما كۆزىتىش(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP نىشانلىرى(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1231,124 +1306,183 @@ msgstr ""
 "ئۇلىنىش ھالىتىنى تەكشۈرگەندە ئىزدەش ئۈچۈن ئىشلىتىدىغان IP ئادرېس ياكى پەش "
 "بىلەن ئايرىلغان IP ئادرېسلارنىڭ تىزىمى."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "ئۇلىنىشتىكى كېچىكتۈرۈش(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "ئۇلىنىشنى ئۈزۈشتىكى كېچىكتۈرۈش(_D):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "بىرىنچى DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "بايت"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "يول تەننەرخى(_C):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "چاچ قىسقۇچ ئۇسۇلى(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "كۆۋرۈكسىمان باغلىنىشلار(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
+msgstr "ئۇلىنىشنى ئۈزۈشتىكى كېچىكتۈرۈش(_D):"
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "تور ئۇلاشنى قوزغات(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (Spanning Tree Protocol) ئىناۋەتلىك قىل(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "ئەڭ چوڭ يېشى(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "قېرىش ۋاقتى(_A):"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "كۆڭۈلدىكى"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1359,442 +1493,536 @@ msgstr ""
 "دېتال ئادرېس قىلىپ ئىشلىتىلىدۇ. بۇ ئىقتىدار MAC نىڭ كىلونى دېيىلىدۇ. مىسال: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "ئادرېس"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "ئادرېس"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN ئارايۈز ئاتى(_N):"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "قاتتىق دېتال ئادرېسى:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "ھەرقانداق بىر ئۈسكۈنە"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"نامەلۇم بىر خاتالىق سەۋەبلىك ئۇلاش مەخپىيەتلىك ھۆججىتىنى يېڭىلىيالمىدى."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "مەزكۇر باغلىنىش ئۈچۈن 802.1_X بىخەتەرلىكنى ئىشلەتسۇن"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 #, fuzzy
 msgid "Enable"
 msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 #, fuzzy
 msgid "Priority"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 #, fuzzy
 msgid "Priority Groups"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-#, fuzzy
-msgid "Priority:"
-msgstr "مەرتىۋىسى(_P):"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
+msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
-msgid "Priority Bandwidth:"
+msgid "Priority Bandwidth"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
-msgstr ""
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
+msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "ئىشلەتكۈچى ئاتى(_U):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "مۇلازىمەت(_S)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "ئىمنى كۆرسەت(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "ئىم(_P):"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "ئارايۈز"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "ئاتا ئارايۈز(_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "ئاتا ئارايۈز(_P):"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "قوش پىلاستىك لىنىيە (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "قوشۇلما بۆلۈم ئارايۈزى(AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "ۋاسىتە مۇستەقىل ئارايۈزى(MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 مېگابايت/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 مېگابايت/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 گىگابايت/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 گىگابايت/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "پەرۋا قىلما"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "قولدا"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "ئېغىز(_P):"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "مۇلازىمەت(_S)"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "كۇلونلانغان MAC ئادرېس"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "كۆڭۈلدىكى"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "پەرۋا قىلما"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "ئاڭلىتىش"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "سۈرئەت(_S):"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "تولۇق قوش خىزمەت(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "مەزكۇر باغلىنىشنى ئىشلەتكەندە VPN غا ئاپتوماتىك باغلانسۇن(_V)"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "يوق"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "بارلىق ئىشلەتكۈچىلەر مەزكۇر تورغا باغلىنىشى مۇمكىن(_U)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "مەزكۇر تورنى ئىشلەتكىلى بولىدىغان چاغدا، ئاپتوماتىك باغلانسۇن(_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "مەزكۇر باغلىنىشنى ئىشلەتكەندە VPN غا ئاپتوماتىك باغلانسۇن(_V)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "باغلىنىش ئۇچۇرلىرى(_I)"
+msgid "Firewall _zone"
+msgstr "تورتوسۇق(Firewall) رايونى(_Z):"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "كېپىللىك قىلىنغان باغلىنىش(_C)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "ئاپتوماتىك باغلان(_A)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "تورتوسۇق(Firewall) رايونى(_Z):"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1803,7 +2031,7 @@ msgstr ""
 "IP ئادرېسلىرى كومپيۇتېرىڭىزنى توردا كۆرسىتىپ بېرىدىغان بەلگە. \"قوش\" "
 "كۇنۇپكىسىنى چېكىپ بىر IP ئادرېسى قوشۇڭ."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1811,128 +2039,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "پەقەت ئاپتوماتىك ئادرېسلار"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "ئادرېسلار"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "توشۇش شەكلى(_T):"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "باغلاندى"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "توشۇش شەكلى(_T):"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "ئۈسكۈنە ئاتى+نومۇر"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ئېفىر تورى"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "ھالەت(_M):"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "قولىدا تەڭشەلگەن DNS تەڭشەكلىرىنى ئاپتوماتىك ئىشلەت"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "ئۇلانما-يەرلىك"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "باشقا كومپيۇتېرلار بىلەن ھەمبەھىرلەنگەن"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "ئۇسۇل(_M):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1943,8 +2175,8 @@ msgstr ""
 "ئۆزلەشتۈرۈشىگە ئىجازەت بەرگەن. DHCP خېرىدار ئايرىغۇچنى ئىشلىتىش ئۈچۈن ئۇنى "
 "بۇ يەرگە كىرگۈزۈڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1952,25 +2184,26 @@ msgstr ""
 "باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرىلەر. بىردىن كۆپ "
 "دائىرىلەرنى پەش بىلەن ئايرىڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP خېرىدار كىملىكى:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "دائىرىلەرنى ئىزدە(_E):"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "DNS مۇلازىمېتىرلىرى(_D)؛"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1978,11 +2211,11 @@ msgstr ""
 "باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرە مۇلازىمېتىر(DNS)نىڭ IP "
 "ئادرېسى. بىردىن كۆپ دائىرە مۇلازىمېتىر ئادرېسىنى پەش بىلەن ئايرىڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4 ئادرېس بولسا ئاندىن بۇ سىم ئۇلاش تاماملىنىدۇ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1990,25 +2223,35 @@ msgstr ""
 "ئۇيغۇنلاشقان IPv6 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv4 سەپلەش مەغلۇپ "
 "بولۇپ IPv6 سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "يېتەكلە(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "ئىناۋەتسىز قىلىنغان"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2018,15 +2261,19 @@ msgstr ""
 "باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرە مۇلازىمېتىر(DNS)نىڭ IP "
 "ئادرېسى. بىردىن كۆپ دائىرە مۇلازىمېتىر ئادرېسىنى پەش بىلەن ئايرىڭ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_4 ئادرېس بولسا ئاندىن بۇ سىم ئۇلاش تاماملىنىدۇ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2034,755 +2281,861 @@ msgstr ""
 "ئۇيغۇنلاشقان IPv4 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv6 سەپلەش مەغلۇپ "
 "بولۇپ IPv4  سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "مېترىك"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "ئىمپورت قىل(_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "ئاساس"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "نومۇر(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "تور ID (_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "ئۆزگەرت…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "ئەگەر ئائىلە تورى ئىشلىمىسە، كەزمە ئىشلىتىڭ."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "ئىمنى كۆرسەت(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "سالاھىيەت دەلىللەش"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "ئىجازەت بېرىلگەن ئۇسۇللار:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "سەپلىمە ئۇسۇلى(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "پرېسلاش"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "نۇقتىدىن نۇقتىغا شىفىرلاش(MPPE)نى ئىشلەت(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128 بىتلىق شىفىرلاش زۆرۈر(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "ھالەتلىك MPPE نى ئىشلەت(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "BSD سانلىق-مەلۇمات پرېسلىشىغا يول قوي(_B)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Deflate سانلىق-مەلۇمات پرېسلىشىغا يول قوي(_D)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "TCP باشلىق پرېسلاشنى قوللان(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "ئەكس سادا"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "PPPPP echo بوغچىلىرىنى يوللا(_E)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "ئۇسۇل(_M):"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "يوق"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "ئۇسۇل(_M):"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "ئالىي"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "مەرتىۋىسى(_P):"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "شەخسىي ئاچقۇچ(_K)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 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
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "ئۇلىنىشتىكى كېچىكتۈرۈش(_U):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "ئۇلىنىشنى ئۈزۈشتىكى كېچىكتۈرۈش(_D):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "ئاتا ئارايۈز(_P):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP نىشانلىرى(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP نىشانلىرى(_T):"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ئېفىر تورى"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "كېپىللىك قىلىنغان باغلىنىش(_C)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ئېفىر تورى"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "قاتتىق دېتال ئادرېسى:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "قاتتىق دېتال ئادرېسى:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "مەرتىۋىسى(_P):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "يوللاش كۈچى(_W):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "يوللاش كۈچى(_W):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "ئاتا ئارايۈز(_P):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN ئارايۈز ئاتى(_N):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "كۇلونلانغان MAC ئادرېسى(_C):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN كىملىكى(_I):"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "ئۈسكۈنە ئاتى+نومۇر"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\"+ نومۇر"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "بىخەتەرلىك(_E):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "يوللاش كۈچى(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "مېگابايت/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "سۈرئەت(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "قانال(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "دولقۇن(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "ئىجازەت بېرىلگەن تەكشۈرۈش ئۇسۇللىرى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "EAP(_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "كېڭەيتكىلى بولىدىغان تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "ئىم تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "مىكروسوفت جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "مىكروسوفت جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى ئىككىنچى نەشرى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2791,190 +3144,185 @@ msgstr ""
 "كۆپ ئەھۋالدا، تەمىنلىگۈچىنىڭ PPP مۇلازىمېتىرلىرى بارلىق تەكشۈرۈش ئۇسۇللىرىنى "
 "قوللايدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا، بەزى قوللاش ئۇسۇللىرىنى تاقاپ سىناڭ."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "كۆكچىش"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "كۆۋرۈك"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"ۋ پ ن(VPN)  قىستۇرمىسى VPN باغلىنىشىنى توغرا ئىمپورت قىلالمىدى.\n"
-"\n"
-"خاتالىق: VPN مۇلازىمەت تىپى يوق."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "VPN باغلىنىشىنى ئىمپورت قىلالمىدى"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"‹%s› ھۆججىتىنى ئوقۇيالمىدى ياكى تونۇلغان VPN باغلىنىش ئۇچۇرىنى ئۆز ئىچىگە "
-"ئالمىغان\n"
+"ۋ پ ن(VPN)  قىستۇرمىسى VPN باغلىنىشىنى توغرا ئىمپورت قىلالمىدى.\n"
 "\n"
-"خاتالىق: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "نامەلۇم خاتالىق"
+"خاتالىق: VPN مۇلازىمەت تىپى يوق."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "ئىمپورت قىلىدىغان ھۆججەتنى تاللا"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "قاتتىق دېتال"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "مەۋھۇم"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "باغلىنىش تەھرىرلىگۈچ سۆزلەشكۈسى نامەلۇم خاتالىق سەۋەبىدىن دەسلەپلەشتۈرۈلمىدى."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "يېڭى باغلىنىش قۇرالمىدى"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "باغلىنىشنى ئۆچۈرۈش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s باغلىنىشنى ئۆچۈرۈشنى راستلا ئۆچۈرەمسىز؟"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "ۋ پ ن(VPN) باغلىنىشلىرى(_V)"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "ئادرېس"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "تور ماسكىسى"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "تور ئۆتكىلى"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "مېترىك"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "ئالدى قوشۇلغۇچى"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "‹%s› نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "ئات قويۇلمىغان باغلىنىشنى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "باغلىنىش ئاتى(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "تەھرىرلىگۈچنى دەسلەپلەشتۈرگەندە خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2982,54 +3330,51 @@ msgstr ""
 "باغلىنىشنى تەھرىرلىگۈچ بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى "
 "تېپىلمىدى)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "بۇ باغلىنىشقا قىلغان ھەرقانداق ئۆزگىرىشلەرنى ساقلا."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "بۇ ماشىنىدىكى بارلىق ئىشلەتكۈچىلەرنىڭ بۇ باغلىنىشنى ساقلىشى ئۈچۈن تەكشۈر."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "باغلىنىشنى قۇرالمىدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "باغلىنىشنى تەھرىرلىيەلمىدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "باغلىنىشنى تەھرىرلەش سۆزلەشكۈسىنى قۇرۇشتا خاتالىق كۆرۈلدى."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "تەھرىرلىگۈچنى دەسلەپلەشتۈرگەندە خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
@@ -3038,196 +3383,242 @@ msgstr ""
 "EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز "
 "بۇنى true غا تەڭشەڭ."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "باغلىنىش ئاتى(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "ئېكسپورت قىل(_E)…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "ئەن"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "ئەن"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ھەرگىز"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ھازىر"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d مىنۇت ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d سائەت ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ئاي ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ئاي بۇرۇن"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "DSL باغلىنىشى %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "DSL باغلىنىشى %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "ئاتى"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "ئاخىرقى قېتىم ئىشلەتكەن"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "تاللانغان باغلىنىشنى تەھرىرلەيدۇ"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "تاللانغان باغلىنىشنى تەھرىرلەش ئۈچۈن تەكشۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "تاللانغان باغلىنىشنى ئۆچۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "تاللانغان باغلىنىشنى ئۆچۈرۈش ئۈچۈن تەكشۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "ئىشلەتكىلى بولمايدىغان كۆچمە باغلىنىش تىپى."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "«%s» دېگەن باغلىنىشنى قانداق قۇرۇشنى بىلمىدى"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "باغلىنىش قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "«%s» دېگەن باغلىنىشنى قانداق قۇرۇشنى بىلمىدى"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "UUID ‹%s› نىڭ باغلانمىسىنى تاپالمىدى"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "تور باغلىنىشلىرى"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "ۋ پ ن(VPN) باغلىنىشلىرى(_V)"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X بىخەتەرلىكى"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "802.1X بىخەتەرلىك ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "مەزكۇر باغلىنىش ئۈچۈن 802.1_X بىخەتەرلىكنى ئىشلەتسۇن"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "ئېزېرنېت ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "كۆكچىش ئۈسكۈنىسى تېپىلمىدى."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bond باغلىنىشى %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "كۆكچىش"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "ئېزېرنېت (Ethernet) تورى"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "سىمسىز(Wi-Fi) تورلار"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "bond ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "بىرىنچى DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond باغلىنىشى %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "كۆۋرۈك ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "كۆۋرۈك باغلىنىش %d"
@@ -3235,33 +3626,38 @@ msgstr "كۆۋرۈك باغلىنىش %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "كۆۋرۈك ئېغىز"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "كۆۋرۈك ئېغىز ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "DSL ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "DSL ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "ئاتا ئارايۈز(_P):"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL باغلىنىشى %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3271,55 +3667,54 @@ msgstr ""
 "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن MAC ئادرېسى بېكىتكەن تور "
 "ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "پەرۋا قىلمىدى"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "ئېزېرنېت ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ئېفىر تورى"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "كۇلونلانغان MAC ئادرېس"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "ئېزېرنېت باغلىنىش %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "ئاساسلىق(General) ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3330,183 +3725,187 @@ msgstr ""
 "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن MAC ئادرېسى بېكىتكەن تور "
 "ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand باغلىنىشى %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "ئېزېرنېت باغلىنىش %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "ئاپتوماتىك (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "پەقەت ئاپتوماتىك(VPN) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "پەقەت ئاپتوماتىك ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "ئاپتوماتىك(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "پەقەت ئاپتوماتىك(PPPoE) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "ئاپتوماتىك(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "پەقەت ئاپتوماتىك(DHCP) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "پەقەت Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "قوشۇمچە DNS مۇلازىمېتىرلار(_V):"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "باشقا ئىزدەيدىغان دائىرىلەر(_E):"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s نىڭ IPv4 routes نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "ئاپتوماتىك، پەقەت DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s نىڭ IPv6 routes نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "WiMAX ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX باغلىنىشى %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "كۆچمە كەڭ بەلۋاغ ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "ئىشلەتكىلى بولمايدىغان كۆچمە باغلىنىش تىپى."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچى تىپىنى تاللا"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3515,91 +3914,87 @@ msgstr ""
 "كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىز قوللانغان تېخنىكىنى تاللاڭ. جەزم "
 "قىلالمىسىڭىز، تەمىنلىگۈچىڭىزدىن سوراڭ."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "تەمىنلىگۈچىم G_SM-ئاساسىي تېخنىكىسىنى ئىشلىتىدۇ(i.e.GPRS، EDGE، UMTS، HSPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "تەمىنلىگۈچىم C_DMA -ئاساسىدىكى تېخنىكىنى ئىشلىتىدۇ(1xRTT، EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "يوق"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s نىڭ PPP تەكشۈرۈش ئۇسۇلىنى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "PPP ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "bond ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "vlan ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL باغلىنىشى %d"
@@ -3607,12 +4002,12 @@ msgstr "DSL باغلىنىشى %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 #, fuzzy
 msgid "Team Port"
 msgstr "كۆۋرۈك ئېغىز"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "كۆۋرۈك ئېغىز ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
@@ -3620,58 +4015,58 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "تور باغلىنىشى يوق"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "vlan ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN باغلىنىشى %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "VPN ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "‹%s› ئۈچۈن VPN قىستۇرما مۇلازىمەت تاپالمايدۇ."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "‹%s› ئۈچۈن VPN قىستۇرما مۇلازىمەت تاپالمايدۇ."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "باغلىنىش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "VPN ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "‹%s› ئۈچۈن VPN قىستۇرما مۇلازىمەت تاپالمايدۇ."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN باغلىنىشى %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "بىر VPN باغلىنىش تىپى تاللا"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3682,7 +4077,7 @@ msgstr ""
 "قۇرۇشنى ئىستەيدىغان VPN باغلىنىش تىپى تىزىملىكتە بولمىسا، سىز بەلكىم توغرا "
 "VPN قىستۇرمىسىنى ئورۇنلاشتۇرمىغان بۆلىشىڭىز مۇمكىن."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3691,7 +4086,7 @@ msgstr ""
 "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن BSSID بېكىتكەن سىمسىز(Wi-Fi) "
 "زىيارەت نۇقتىسى(AP)گە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3701,96 +4096,94 @@ msgstr ""
 "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن MAC ئادرېسى بېكىتكەن تور "
 "ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "سىمسىز تور(Wi-Fi) ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "ھەرقانداق بىر ئۈسكۈنە"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "سىمسىز تور(Wi-Fi) باغلىنىشى %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 بىتلىق ئاچقۇچ(16لىك ياكى ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 بىتلىق شىفىر"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "دىنامىكىلىق WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ۋە WPA2 كارخانا نۇسخىسى"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "سىمسىز تور(Wi-Fi) بىخەتەرلىك ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى؛ سىمسىز "
 "تور(Wi-Fi) تەڭشىكى تولۇق ئەمەس."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "سىمسىز تور(Wi-Fi) بىخەتەرلىكى"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "سىمسىز تور(Wi-Fi) بىخەتەرلىك ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "«%s» ئاتلىق بىر ھۆججەت ئەزەلدىن مەۋجۇت."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "ئالماشتۇر(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "سىز ساقلىغان %s نى VPN باغلىنىشىغا ئالماشتۇرامسىز؟"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "ۋ پ ن (VPN)  باغلىنىشىنى ئېكسپورت قىلغىلى بولمىدى"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3801,221 +4194,106 @@ msgstr ""
 "\n"
 "خاتالىق: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "ۋ پ ن (VPN)  باغلىنىشىنى ئېكسپورت قىل..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "قۇلۇپسىزلا(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "بۇ ئۈسكۈنىنى ئاپتوماتىك قۇلۇپسىزلا"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "باغلىنىش ئۇچۇرلىرى"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "ئاكتىپ تور باغلىنىشلىرى"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "CA گۇۋاھنامىسى تاللا"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "شەخسىي ئاچقۇچ(_K)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "CA گۇۋاھنامىسى تاللا"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىز ئاستىدىكى تەڭشەكلەر بىلەن سەپلەنگەن:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "ئۈسكۈنىڭىز:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "تەمىنلىگۈچىڭىز:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "پىلانىڭىز:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر "
-"باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى زىيارەت "
-"قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىزنىڭ "
-"تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش ئىقتىدار تىزىملىكىدىن "
-"\"تور باغلىنىشلىرى\" نى تاللاڭ."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "دۆلىتىم تىزىملانماپتۇ"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "تىزىملانمىغان"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "پىلانىڭىزنى تاللاڭ(_S):"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "تاللانغان پىلان APN(زىيارەت نۇقتا ئاتى)(_A)"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"ئاگاھلاندۇرۇش: ناتوغرا بىر پىلاننى تاللاش كەڭ بەلۋاغ ھېسابات ھەق تۆلەش "
-"مەسىلىسى ياكى باغلىنالماسلىقنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n"
-"\n"
-"پىلانىڭىزنى جەزم قىلالمىسىڭىز تەمىنلىگۈچىڭىزدىن پىلانىڭىزنىڭ APN ئىنى سوراڭ"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "ھەق تۆلەش پىلانىڭىزنى كىرگۈزۈڭ"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "پىلانىم تىزىملىكتە يوق..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "تەمىنلىگۈچىڭىزنى تىزىملىكتىن تاللاڭ(_L)؛"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "تەمىنلىگۈچى"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "تەمىنلىگۈچى:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "تەمىنلىگۈچىم GSM تېخنىكىسىنى ئىشلىتىدۇ(GPRS، EDGE، UMTS، HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "تەمىنلىگۈچىم CDMA تېخنىكىسىنى ئىشلىتىدۇ(1xRTT، EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "تەمىنلىگۈچىڭىزنى تاللاڭ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "دۆلەت ياكى رايون تىزىملىكى:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "دۆلەت ياكى رايون"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "دۆلىتىم تىزىملانماپتۇ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "تەمىنلىگۈچىڭىزنىڭ دۆلىتى ياكى رايونىنى تاللاڭ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ئورۇنلاشتۇرۇلغان GSM ئۈسكۈنىسى"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ئورۇنلاشتۇرۇلغان CDMA ئۈسكۈنىسى"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "ھەرقانداق بىر ئۈسكۈنە"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4023,190 +4301,268 @@ msgstr ""
 "بۇ ياردەمچى پروگرامما كۆچمە تېلېفون تورى(3G) نى قۇلايلىق تەڭشەپ كۆچمە كەڭ "
 "بەلۋاغقا باغلىنىشقا ياردەم قىلىدۇ."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ئاستىدىكى ئۇچۇرلارغا ئېھتىياجىڭىز چۈشىدۇ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "كەڭ بەلۋاغ تەمىنلىگۈچىڭىزنىڭ ئاتى"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىز ئاتى"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(بەزى ئەھۋالدا) كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىزنىڭ APN(زىيارەت نۇقتا ئاتى) ئى"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "بۇ كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن بىر باغلىنىش قۇر(_T):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "ھەرقانداق بىر ئۈسكۈنە"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشىنى سەپلە"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "دۆلەت ياكى رايون"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "تەمىنلىگۈچىڭىزنىڭ دۆلىتى ياكى رايونىنى تاللاڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "تەمىنلىگۈچىڭىزنى تىزىملىكتىن تاللاڭ(_L)؛"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "تەمىنلىگۈچىم GSM تېخنىكىسىنى ئىشلىتىدۇ(GPRS، EDGE، UMTS، HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "تەمىنلىگۈچىم CDMA تېخنىكىسىنى ئىشلىتىدۇ(1xRTT، EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "تەمىنلىگۈچىڭىزنى تاللاڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "پىلانىڭىزنى تاللاڭ(_S):"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "تاللانغان پىلان APN(زىيارەت نۇقتا ئاتى)(_A)"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"ئاگاھلاندۇرۇش: ناتوغرا بىر پىلاننى تاللاش كەڭ بەلۋاغ ھېسابات ھەق تۆلەش "
+"مەسىلىسى ياكى باغلىنالماسلىقنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n"
+"\n"
+"پىلانىڭىزنى جەزم قىلالمىسىڭىز تەمىنلىگۈچىڭىزدىن پىلانىڭىزنىڭ APN ئىنى سوراڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "ھەق تۆلەش پىلانىڭىزنى كىرگۈزۈڭ"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىز ئاستىدىكى تەڭشەكلەر بىلەن سەپلەنگەن:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "ئۈسكۈنىڭىز:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "تەمىنلىگۈچىڭىز:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "پىلانىڭىز:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر "
+"باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى زىيارەت "
+"قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىزنىڭ "
+"تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش ئىقتىدار تىزىملىكىدىن "
+"\"تور باغلىنىشلىرى\" نى تاللاڭ."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(يوق)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A گۇۋاھنامىسى:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "نامەلۇم"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "CA گۇۋاھنامىسى تاللا"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "قۇلۇپسىزلا(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "بۇ ئىمنى ھەر ۋاقىت سورىسۇن(_K)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "‹%s› كە باغلىنىش ئۈچۈن بىر ئىمغا ئېھتىياجلىق."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "ئىم(_P):"
+msgid "Sh_ow passwords"
+msgstr "ئىمنى كۆرسەت(_W)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "ئىم(_P):"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "ئىمنى كۆرسەت(_W)"
+msgid "_Secondary Password:"
+msgstr "ئىم(_P):"
+
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "ئىم(_P):"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "ئۈز"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "يوق"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "دىنامىكىلىق WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "قۇر(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
@@ -4214,35 +4570,35 @@ msgstr ""
 "سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى "
 "زۆرۈردۇر."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەش زۆرۈر"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەشنى تەلەپ قىلدى"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "قۇرماقچى بولغان سىمسىز(Wi-Fi) تورنىڭ ئاتىنى كىرگۈزۈڭ."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تور"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -4250,35 +4606,55 @@ msgstr ""
 "باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك تەپسىلاتلىرىنى "
 "كىرگۈزۈڭ."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "باغلىنىش(_O):"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "تەمىنلىگۈچىمنى تاپالمىدى ۋە قولۇمدا كىرگۈزۈشنى ئىستەيمەن(_M):"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "تەمىنلىگۈچى:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "دۆلەت ياكى رايون تىزىملىكى:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "دۆلەت ياكى رايون"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "سىملىق"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4288,17 +4664,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "تور ئاتى(_N)"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "باغلىنىش(_O):"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "ئىشلىتىش ئۇسۇلى:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4306,7 +4704,7 @@ msgstr ""
 "بۇ پروگرامما NetworkManager پروگراممىسىنىڭ بىر بۆلىكى(https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4314,414 +4712,471 @@ msgstr ""
 "ئۇ بۇيرۇق قۇر ئالماشتۇرۇش ئۈچۈن لايىھىلەنگەن بولماستىن، گىنوم ئۈستەلئۈستى "
 "مۇھىتىدا ئىجرا قىلىشقا ئۇيغۇنلاشتۇرۇلغان."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "قوزغىتىلمىغان"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "خەتلىتىلمىگەن"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ئۆيدىكى تور (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "ئۆيدىكى تور"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ئىزدەۋاتىدۇ"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "خەتلىتىش رەت قىلىندى"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s كېزىۋاتىدۇ)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (كېزىۋاتىدۇ)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "تورنى كېزىۋاتىدۇ (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "تورنى كېزىۋاتىدۇ"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM كارتىسى ‹%s› (‹%s› نىڭدىكى) نىڭ PIN كودى"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "PIN كودى ئېھتىياجلىق"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن PIN كودى كېرەك"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئاكتىپ:(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "كەزمە"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s باغلىنىش"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER ياكى PEM گۇۋاھنامىسى(der.*، pem.*، crt.*، cer.*)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER، PEM ياكى PKCS#12 شەخسىي ئاچقۇچلار(*.der، *.pem،*.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "PAC ھۆججىتىنى تاللاڭ…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC ھۆججەتلىرى(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "ھەممە ھۆججەتلەر"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "ئاتسىز"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "سالاھىيىتى دەلىللەنگەن"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "ئىككىلىسى"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "ئاتسىز كىملىك(_M):"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC ھۆججىتى(_F):"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "ئىچكى ئىسپات"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ئاپتوماتىك PAC تەمىنلەش"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "بىر گۇۋاھنامە تەكشۈرۈش گۇۋاھنامىسى تاللا..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "نەشرى 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "نەشرى 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A گۇۋاھنامىسى:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP نەشرى(_V):"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128 بىتلىق شىفىر"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "ئىمنى كۆرسەت(_W)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "كىملىك(_I):"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "تونىل TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "قوغدىلىدىغان EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "كىملىك دەلىللەش(_T):"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (كۆڭۈلدىكى)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "ئوچۇق سىستېما"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "ھەمبەھىرلەنگەن ئاچقۇچ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (كۆڭۈلدىكى)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "ئاچقۇچ(_K):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "ئاچقۇچنى كۆرسەت(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP ئىندېكسى(_X):"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "تىپى(_T):"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (كۆڭۈلدىكى)"
+
+#~ msgid "Ignored"
+#~ msgstr "پەرۋا قىلمىدى"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr ""
+#~ "نامەلۇم بىر خاتالىق سەۋەبلىك ئۇلاش مەخپىيەتلىك ھۆججىتىنى يېڭىلىيالمىدى."
+
+#, fuzzy
+#~ msgid "Priority:"
+#~ msgstr "مەرتىۋىسى(_P):"
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#~ msgid "_Automatically connect to this network when it is available"
+#~ msgstr "مەزكۇر تورنى ئىشلەتكىلى بولىدىغان چاغدا، ئاپتوماتىك باغلانسۇن(_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "باغلىنىش ئۇچۇرلىرى(_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "VPN باغلىنىشىنى ئىمپورت قىلالمىدى"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "‹%s› ھۆججىتىنى ئوقۇيالمىدى ياكى تونۇلغان VPN باغلىنىش ئۇچۇرىنى ئۆز ئىچىگە "
+#~ "ئالمىغان\n"
+#~ "\n"
+#~ "خاتالىق: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "نامەلۇم خاتالىق"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "بىر گۇۋاھنامە تەكشۈرۈش گۇۋاھنامىسى تاللا..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A گۇۋاھنامىسى:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "تور باشقۇرغۇچ"
@@ -4755,15 +5210,6 @@ msgstr "تىپى(_T):"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "ئاپتوماتىك قول ئېلىشىش(_O)"
 
@@ -4857,12 +5303,6 @@ msgstr "تىپى(_T):"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ئىككىنچى DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "ئۈچىنچى DNS:"
-
 #~ msgid "_Device MAC address:"
 #~ msgstr "ئۈسكۈنە MAC ئادرېسى(_D):"
 
@@ -4914,12 +5354,6 @@ msgstr "تىپى(_T):"
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "پەقەت ئاپتوماتىك(PPP) ئادرېسلار"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "WiMAX ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX باغلىنىشى %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4943,9 +5377,6 @@ msgstr "تىپى(_T):"
 #~ msgid "Error: %s"
 #~ msgstr "خاتالىق: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "DUN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "تېلېفونىڭىز ئىشلىتىشكە ھازىرلاندى!"
 
@@ -5050,12 +5481,6 @@ msgstr "تىپى(_T):"
 #~ msgid "A_vailable to all users"
 #~ msgstr "بارلىق ئىشلەتكۈچىلەر ئىشلىتەلەيدۇ"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "ئاپتوماتىك باغلان(_A)"
-
-#~ msgid "_Import"
-#~ msgstr "ئىمپورت قىل(_I)"
-
 #~ msgid "An unknown error occurred."
 #~ msgstr "نامەلۇم خاتالىق كۆرۈلدى."
 
diff --git a/po/uk.po b/po/uk.po
index c8fd04f1..ff4d906b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2012-03-24 09:49+0300\n"
 "Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
@@ -19,49 +20,58 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Мережа"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Організуйте ваші мережеві з'єднання"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Мережні з'єднання"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Увімкнути мережеві з'єднання"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Керування параметрами мережних з'єднань"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Вимкнути сповіщення про підключення"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Вимкнути сповіщення про відключення"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "Вимкнути сповіщення про підключення"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -69,188 +79,202 @@ msgid ""
 msgstr ""
 "Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Вимкнути сповіщення про доступні мережі"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Встановіть у TRUE, для вимикання сповіщення про доступні бездротові мережі."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Штамп"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Використовується для визначення параметрів, які мають бути перенесені у нову "
 "версію."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Вимкнути створення з'єднання Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Встановіть у TRUE, для вимикання нестандартних мереж при використані аплету."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "Виберіть сертифікат CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Менеджер мережі"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Немає з'єднання з мережею"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Аплет NetworkManager"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "Автентифікація дротової мережі 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_З'єднати"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_Назва мережі:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Спеціально"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Не вдалося додати/встановити з'єднання"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Невдале з'єднання"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Не вдалось від'єднати пристрій"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Не вдалося від'єднати"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Не вдалося встановити з'єднання"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Більше не виводити це повідомлення"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "З'єднання VPN «%s» розірвано, оскільки мережне з'єднання перервано."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -270,7 +294,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: з'єднання з мережею було перервано."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: служба VPN несподівано завершилась."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -290,7 +314,7 @@ msgstr ""
 "Неможливо встановити з'єднання VPN «%s»: служба VPN повернула неправильну "
 "конфігурацію."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -299,7 +323,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: вичерпано час очікування."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -308,7 +332,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: служба VPN не запустилась вчасно."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -317,7 +341,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: неможливо запустити службу VPN."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -327,7 +351,7 @@ msgstr ""
 "Неможливо встановити з'єднання VPN «%s»: неможливо знайти відповідний ключ "
 "для VPN."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -336,7 +360,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»: неправильний ключ доступу до VPN."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -345,7 +369,7 @@ msgstr ""
 "\n"
 "Неможливо встановити з'єднання VPN «%s»"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -353,19 +377,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Повідомлення входу VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Збій з'єднання VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -378,7 +402,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -391,328 +415,339 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "пристрій не готовий (відсутній мікрокод)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "пристрій не готовий"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "з'єднання розірвано"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Від'єднатися"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "пристрій не керується"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Немає доступних мережних пристроїв"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "З'єднання _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Налаштувати VPN..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "З'єднання _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager не запущено..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Підтримку мережі вимкнено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_Мережа"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "_Бездротова мережа"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Мобільне _широкосмугове з'єднання"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Увімкнути _сповіщення"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "_Інформація про з'єднання"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Змінити з'єднання..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Ви приєднані до мережі «%s»."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "З'єднання розірвано"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Мережне з'єднання було розірвано."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Підготовка мережного з'єднання «%s»..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Для мережного з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Отримання мережної адреси для «%s»..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Мережне з'єднання «%s» встановлено"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Запуск з'єднання VPN «%s»..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Для з'єднання VPN «%s» вимагається автентифікація…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Отримання адреси VPN для «%s»…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "З'єднання VPN «%s» установлено"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Немає з'єднання з мережею"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Аплет NetworkManager"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Неправильний код PUK; зверніться до постачальника послуг."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Неправильний код PIN; зверніться до постачальника послуг."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Надсилається код розблокування..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобільне широкосмугове (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Мобільні широкосмугові"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Доступні"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Нове мобільне широкосмугове з'єднання"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "З'єднання встановлено"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Наразі ви приєднані до мобільної широкосмугової мережі."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Пароль мобільної широкосмугової мережі"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Ви тепер зареєстровані в домашній мережі."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Ви тепер зареєстровані в роумінговій мережі."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Наразі ви приєднані до мобільної широкосмугової мережі."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Підготовка мобільного широкосмугового з'єднання «%s»..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Налаштовування мобільного широкосмугового з'єднання «%s»..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 "Для мобільного широкосмугового з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Мобільне широкосмугове з'єднання «%s» встановлено"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet автоматично"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Дротові мережі (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Дротова мережа (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Дротові мережі"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Дротова мережа"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "Ви приєднані до провідної мережі."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Підготовка дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Налаштовування дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Для дротового мережного з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Отримання адреси у дротовій мережі для «%s»..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Дротове з'єднання «%s» встановлено"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Автентифікація DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "З'єднатись з прихованою бездротовою мережею"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Створити нову бездротову мережу"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(немає)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Не вдалося додати нове з'єднання"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Дротові мережі (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Дротова мережа (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
@@ -720,247 +755,261 @@ msgstr[0] "Дротова мережа"
 msgstr[1] "Дротова мережа"
 msgstr[2] "Дротова мережа"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "WiMAX вимкнено"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 #, fuzzy
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX вимкнено на апаратному рівні"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Ще мережі"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "Доступні бездротові мережі"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Використовувати меню мережі для підключення до бездротової мережі"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Ви приєднані до бездротової мережі «%s»."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Підготовка мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Налаштовування дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 "Для бездротового мережного з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Отримання мережної адреси для «%s»..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Бездротове мережне з'єднання «%s» встановлено: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Дротове з'єднання «%s» встановлено"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Не вдалося встановити з'єднання"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Помилка при показі відомостей з'єднання: "
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "Динамічний WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Адреси"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Без перевірки автентичності"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (типово)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/c"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Невідомо"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Невідома"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Адреса IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Широкомовна адреса"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Маска мережі"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Маска мережі"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "Первинний DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "Вторинний DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "Трійкове DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Загальне"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Апаратна адреса"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Драйвер"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Швидкість"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Захист:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Типовий шлюз"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Зігнорувати"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Тип VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Шлюз VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Користувач VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Шапка VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Основне з'єднання"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Невідомо"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Немає доступних активних з'єднань!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -968,16 +1017,20 @@ msgstr ""
 "© Novell, Inc., 2005-2008\n"
 "і багато інших учасників та перекладачів"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Аплет для керування мережними пристроями та з'єднаннями."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Максим Дзюманенко <dziumanenko@gmail.com>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -985,33 +1038,33 @@ msgstr ""
 "Аплет NetworkManager не може знайти деякі потрібні ресурси (не знайдено "
 "файл .ui)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Відсутні компоненти програми"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Пароль мобільної широкосмугової мережі"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Для підключення до мережі «%s» вимагається пароль."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Для розблокування SIM потрібен код PIN"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Для розблокування SIM потрібен код PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1020,25 +1073,25 @@ msgstr ""
 "Для роботи мобільного широкосмугового пристрою «%s» потрібен код PIN SIM."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Код PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Показати код PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Для розблокування SIM потрібен код PUK"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Для розблокування SIM потрібен код PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1047,35 +1100,42 @@ msgstr ""
 "Для роботи мобільного широкосмугового пристрою «%s» потрібен код SIM PUK."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Код PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Новий код PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Введіть новий код PIN ще раз:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Показати коди 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Інформація про з'єднання"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Не вдалось створити з'єднання PAN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1084,41 +1144,41 @@ msgstr ""
 "Адреси IP ідентифікують ваш комп'ютер у мережі. Натисніть кнопку «Додати», "
 "щоб додати адресу IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "В_илучити"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Ігнорувати автоматично отримані маршрути"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "_Використовувати це з'єднання лише для ресурсів у його мережі"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1126,17 +1186,17 @@ msgstr ""
 "Якщо увімкнено, це з'єднання ніколи не буде використовуватись як типове "
 "мережне з'єднання."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Створити…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Виберіть тип з'єднання VPN"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1148,213 +1208,273 @@ msgstr ""
 "бажаний тим з'єднання не з'явився у списку, то додаток VPN некоректно "
 "встановлено."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "С_лужба:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "Широкомовна адреса:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Основне з'єднання:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Режим:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Змінити"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "Інтерфейс:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "Первинний DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "байт"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Основне з'єднання:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_Мережа"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "автоматично"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "типово"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1365,437 +1485,530 @@ msgstr ""
 "пристрою активного для цього з'єднання. ця функція відома як клонування MAC "
 "або spoofing.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Апаратна адреса:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Будь-який пристрій"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Не вдалось оновити секрети з'єднання через невідому помилку."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Використовувати захист _802.1X для цього з'єднання"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-#, fuzzy
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-#, fuzzy
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-#, fuzzy
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Користувач:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "С_лужба:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "П_оказати пароль"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Пароль:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Інтерфейс"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Інтерфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Інтерфейс:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Звита пара (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Інтерфейс під'єднання пристрою (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Інтерфейс незалежний від носія (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Мб/c"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Мб/c"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Гб/с"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Ігнорувати"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Вручну"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Порт:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "С_лужба:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_Клонована адреса MAC:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "Па_роль до мережного ключа:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Типово"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Ігнорувати"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Широкомовна адреса:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "Па_роль до мережного ключа:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Швидкість:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "Повний _дуплекс"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:32
+#, fuzzy
+msgid "No"
+msgstr "Без перевірки автентичності"
+
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "Ви приєднані до провідної мережі."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Автоматично розблоковувати цей пристрій"
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "_Інформація про з'єднання"
+msgid "_Metered connection"
+msgstr "Основне з'єднання:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Підключати _автоматично"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1804,7 +2017,7 @@ msgstr ""
 "Адреси IP ідентифікують ваш комп'ютер у мережі. Натисніть кнопку «Додати», "
 "щоб додати адресу IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1812,128 +2025,131 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Автоматично, лише адреси"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_З'єднати"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "С_лужба:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Автоматично з ручними налаштування DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "Локальне посилання"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Спільний з іншим комп'ютерами"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Метод:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1944,8 +2160,8 @@ msgstr ""
 "комп'ютерів до мережі. Якщо у вас використовується такий ідентифікатор, "
 "введіть его."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1953,25 +2169,26 @@ msgstr ""
 "Домени використовують для розв'язання назв вузлів. Використовуйте розділювач "
 "для вказування кількох доменів."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "_ID клієнту DHCP:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Домени по_шуку:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Сервери _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1979,11 +2196,11 @@ msgstr ""
 "IP адреси доменів використовуються для розв'язання назв вузлів. "
 "Використовуйте розділювач для вказування кількох доменів."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Вимагати адресацію IPv_4 для цього з'єднання"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1991,25 +2208,34 @@ msgstr ""
 "При підключені до мереж із можливістю IPv6: дозволяє встановити з'єднання у "
 "випадку помилки у конфігурації IPv4, але успішної конфігурації IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "М_аршрути..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Не вказувати адресу"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2019,15 +2245,19 @@ msgstr ""
 "IP адреси доменів використовуються для розв'язання назв вузлів. "
 "Використовуйте розділювач для вказування кількох доменів."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Вимагати адресацію IPv_6 для цього з'єднання"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2035,750 +2265,854 @@ msgstr ""
 "При підключенні до мереж із можливістю IPv4: дозволяє встановити з'єднання у "
 "випадку помилки у налаштуванні IPv6, але успішного налаштування IPv4."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Метрика"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Імпорт"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Основний"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Номер:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "Ідентифікатор _мережі:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Змінити..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Вмикати _роумінг, якщо недоступна домашня мережа"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "П_оказати паролі"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Автентифікація"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Дозволені методи:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Налаштувати _методи..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Стиснення"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Використовувати _шифрування точка-точка (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "_Потребує 128-и бітне шифрування"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Використовувати _Stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Дозволити стиснення _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Дозволити стиснення _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Використовувати с_тиснення заголовків TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Луна"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Надсилати пакети від_луння PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Метод:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Без перевірки автентичності"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Метод:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Додатково"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Дротові мережі"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_Захист:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "Приватний кл_юч:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Основне з'єднання:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "IPv4"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Апаратна адреса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Апаратна адреса:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Поту_жність передачі:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Поту_жність передачі:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "Інтерфейс:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "Інтерфейс:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_Клонована адреса MAC:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 ГГц)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Спеціально"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Поту_жність передачі:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Мб/c"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Швидкість:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Діапазон:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Дозволені способи автентифікації"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol версія 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2788,190 +3122,185 @@ msgstr ""
 "автентифікації. Якщо ж не вдалось з'єднатись, спробуйте вимкнути підтримку "
 "деяких способів.</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Модулю VPN не вдалось коректно імпортувати з'єднання VPN'\n"
-"\n"
-"Помилка: немає типу служби VPN."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Не вдалось імпортувати з'єднання VPN"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Неможливо прочитати файл «%s», або ж він не містить розпізнані відомості про "
-"з'єднання VPN.\n"
+"Модулю VPN не вдалось коректно імпортувати з'єднання VPN'\n"
 "\n"
-"Помилка: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Невідома помилка"
+"Помилка: немає типу служби VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Виберіть файл для імпорту"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "Апаратна адреса:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Експорт з'єднання VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Не вдалось запустити вікно редактора з'єднань через невідому помилку."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Не вдається створити нове з'єднання"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Помилка при видаленні з'єднання"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Вилучити з'єднання %s?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "З'єднання _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Маска"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Префікс"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Редагування %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Редагування бездротового з'єднання"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Назва з'єднання:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Помилка під час ініціалізації редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Помилка при додаванні з'єднання"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2979,106 +3308,104 @@ msgstr ""
 "Редактор з'єднань не може знайти деякі потрібні ресурси (не знайдено файл ."
 "ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "З_берегти"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Зберегти параметри з'єднання."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Ввести пароль адміністратора для того, щоб зробити це з'єднання спільним для "
 "всіх користувачів комп'ютера."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Не вдається створити нове з'єднання"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Не вдалось змінити з'єднання"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "Помилка при створенні редактора з'єднань."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Помилка під час ініціалізації редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Помилка при додаванні з'єднання"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Назва з'єднання:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Експорт"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 #, fuzzy
 msgid "_Relabel"
 msgstr "позначка"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 #, fuzzy
 msgid "Relabel"
 msgstr "позначка"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "ніколи"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "зараз"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -3086,7 +3413,7 @@ msgstr[0] "%d хвилина тому"
 msgstr[1] "%d хвилини тому"
 msgstr[2] "%d хвилин тому"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -3094,7 +3421,7 @@ msgstr[0] "%d година тому"
 msgstr[1] "%d години тому"
 msgstr[2] "%d годин тому"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -3102,7 +3429,7 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -3110,7 +3437,7 @@ msgstr[0] "%d місяць тому"
 msgstr[1] "%d місяці тому"
 msgstr[2] "%d місяців тому"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -3118,132 +3445,177 @@ msgstr[0] "%d рік тому"
 msgstr[1] "%d роки тому"
 msgstr[2] "%d років тому"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Помилка при додаванні з'єднання"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Дротове з'єднання %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Дротове з'єднання %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Останнє з'єднання"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Змінити виділене з'єднання"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Для зміни  виділеного з'єднання потрібна автентифікація"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Вилучити виділене з'єднання"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Для видалення виділеного з'єднання потрібна автентифікація"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Непідтримуваний тип мобільного широкосмугового з'єднання."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Невідомо, як створювати з'єднання «%s»"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Помилка редагування з'єднання"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Помилка створення з'єднання"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Помилка при додаванні з'єднання"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Невідомо, як створювати з'єднання «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Помилка редагування з'єднання"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Не знайдено зв'язку з UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Мережні з'єднання"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "З'єднання _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "Захист 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс налаштовування захисту з'єднання Wi-Fi."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Використовувати захист _802.1X для цього з'єднання"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "не вдалось знайти пристрій Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Дротове з'єднання %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "_Мережа"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Бездротова мережа"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "Первинний DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "Дротове з'єднання %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "Дротове з'єднання %d"
@@ -3251,36 +3623,41 @@ msgstr "Дротове з'єднання %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача DSL."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Інтерфейс:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "З'єднання DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3290,61 +3667,60 @@ msgstr ""
 "Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
 "первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Зігнорувати"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "_Клонована адреса MAC:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "Дротове з'єднання %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Типово"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3355,186 +3731,188 @@ msgstr ""
 "Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
 "первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування Wi-Fi"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "Дротове з'єднання %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Дротове з'єднання %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Автоматично (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматично (VPN, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Автоматично, лише адреси"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Автоматично (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматично (PPPoE, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Автоматично (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматично (DHCP, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Лише місцевий"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "Сервери _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "Домени по_шуку:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Маршрути IPv4 для %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Параметри IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Автоматично, лише DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Зміна маршрутів IPv6 для %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Параметри IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Не вдалось завантажити інтерфейс користувача DSL."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "З'єднання DSL %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Непідтримуваний тип мобільного широкосмугового з'єднання."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Вибір типу мобільного широкосмугового провайдера"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3543,7 +3921,7 @@ msgstr ""
 "Оберіть технологію, яку використовує ваш провайдер мобільного "
 "широкосмугового інтернету. Якщо ви не впевнені, спитайте провайдера."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Мій провайдер використовує технологію на основі _GSM (т.е. GPRS, EDGE, UMTS, "
@@ -3551,89 +3929,85 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Мій провайдер використовує технологію на основі C_DMA (т.е. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "немає"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Методи автентифікації PPP для %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Параметри PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
 "мережі."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "Дротове з'єднання %d"
@@ -3641,11 +4015,11 @@ msgstr "Дротове з'єднання %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr ""
@@ -3655,59 +4029,59 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Немає з'єднання з мережею"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "VPN з'єднання %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Неможливо завантажити інтерфейс користувача VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Не вдалось знайти модуль VPN для «%s»"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Не вдалось знайти модуль VPN для «%s»"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Невдале з'єднання"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Неможливо завантажити інтерфейс користувача VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Не вдалось знайти модуль VPN для «%s»"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN з'єднання %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Виберіть тип з'єднання VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3718,7 +4092,7 @@ msgstr ""
 "бажаний тим з'єднання не з'явився у списку, то додаток VPN некоректно "
 "встановлено."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3727,7 +4101,7 @@ msgstr ""
 "Прив'язувати з'єднання до BSSID бездротової точки доступу. Приклад: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3737,101 +4111,99 @@ msgstr ""
 "Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
 "первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Будь-який пристрій"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Дротове з'єднання %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-бітний ключ (Hex або ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-и бітна ключова фраза"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "Динамічний WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не вдалось завантажити інтерфейс налаштовування захисту з'єднання Wi-Fi, "
 "налаштовування Wi-Fi пропускається."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "Захист бездротової мережі"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс налаштовування захисту з'єднання Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Файл з іменем «%s» вже існує."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Замінити"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ви дійсно хочете замінити %s?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Не вдається імпортувати з'єднання VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3842,223 +4214,106 @@ msgstr ""
 "\n"
 "Помилка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Експорт з'єднання VPN..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Розблокувати"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Автоматично розблоковувати цей пристрій"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Інформація про з'єднання"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Увімкнути мережеві з'єднання"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Сертифікат C_A:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Обрати персональний сертифікат..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "Приватний кл_юч:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Па_роль до мережного ключа:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Обрати персональний сертифікат..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Сертифікат _користувача:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Мобільне широкосмугове з'єднання налаштовано з наступними параметрами:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Пристрій:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Провайдер:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "План:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Зараз буде виконано приєднання до вашого мобільного широкосмугового "
-"провайдера з використанням вказаних параметрів. Якщо з'єднання не буде "
-"встановлено або  не буде доступу до ресурсів мережі, перевірте параметри ще "
-"раз.  Щоб змінити параметри мобільного широкосмугового з'єднання. Щоб "
-"змінити параметри з'єднання, виберіть пункт «Мережні з'єднання» з меню "
-"Система >> Параметри."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Підтвердження параметрів мобільного з'єднання"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Моєї країни немає у списку"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Немає у списку"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Виберіть план:"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "Виберіть _точку доступу (APN) цього тарифного плану:"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Увага: вибір неправильного тарифного плану може призвести до проблем із "
-"рахунками чи зробити підключення неможливим.\n"
-"\n"
-"Якщо ви не впевнені, спитайте у провайдера, яка точка доступу (APN) "
-"відповідає вашому тарифному плану."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Виберіть тарифний план"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Мого плану немає у списку..."
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Виберіть п_ровайдера зі списку:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Провайдер"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Провайдер:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Мій провайдер використовує технологію GSM (GPRS, EDGE, UMTS, HSPDA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Мій провайдер використовує технологію CDMA (1xRTT. EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Виберіть свого провайдера"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Список країн або областей:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Країна або область"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Моєї країни немає у списку"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Виберіть країну вашого провайдера або область"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Встановлено пристрій GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Встановлено пристрій CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Будь-який пристрій"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Нове мобільне широкосмугове з'єднання"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -4066,231 +4321,311 @@ msgstr ""
 "Цей помічник допоможе вам налаштувати мобільне широкосмугове підключення до "
 "мобільної (3G) мережі."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Вам буде потрібна наступна інформація:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Назва провайдера"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Тарифний план"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(у деяких випадках) Точка доступу (APN), відповідає тарифному плану"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Створити з'єднання для _цього мобільного широкосмугового пристрою:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Будь-який пристрій"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Налаштовування мобільного широкосмугового пристрою"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Нове мобільне широкосмугове з'єднання"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Країна або область"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Виберіть країну вашого провайдера або область"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Виберіть п_ровайдера зі списку:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Мій провайдер використовує технологію GSM (GPRS, EDGE, UMTS, HSPDA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Мій провайдер використовує технологію CDMA (1xRTT. EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Виберіть свого провайдера"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Виберіть план:"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "Виберіть _точку доступу (APN) цього тарифного плану:"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Увага: вибір неправильного тарифного плану може призвести до проблем із "
+"рахунками чи зробити підключення неможливим.\n"
+"\n"
+"Якщо ви не впевнені, спитайте у провайдера, яка точка доступу (APN) "
+"відповідає вашому тарифному плану."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Виберіть тарифний план"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Мобільне широкосмугове з'єднання налаштовано з наступними параметрами:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Пристрій:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Провайдер:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "План:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Зараз буде виконано приєднання до вашого мобільного широкосмугового "
+"провайдера з використанням вказаних параметрів. Якщо з'єднання не буде "
+"встановлено або  не буде доступу до ресурсів мережі, перевірте параметри ще "
+"раз.  Щоб змінити параметри мобільного широкосмугового з'єднання. Щоб "
+"змінити параметри з'єднання, виберіть пункт «Мережні з'єднання» з меню "
+"Система >> Параметри."
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Підтвердження параметрів мобільного з'єднання"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(немає)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "Сертифікат C_A:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Невідомо"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Обрати персональний сертифікат..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Сертифікат _користувача:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Помилка редагування з'єднання"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Розблокувати"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Запитувати цей пароль щоразу"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Для підключення до мережі «%s» вимагається пароль."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_Пароль:"
+msgid "Sh_ow passwords"
+msgstr "П_оказати паролі"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_Пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "П_оказати паролі"
+msgid "_Secondary Password:"
+msgstr "_Пароль:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Від'єднатися"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без перевірки автентичності"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "Динамічний WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "С_творити"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "Для доступу до бездротової мережі «%s» необхідні паролі або ключі шифрування."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "Створити нову бездротову мережу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Нова бездротова мережа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введіть назву бездротової мережі, яку треба створити."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "З'єднатись з прихованою бездротовою мережею"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "Прихована бездротова мережа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4299,37 +4634,55 @@ msgstr ""
 "Введіть назву та параметри безпеки прихованої бездротової мережі, до якої "
 "треба приєднатись."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_Захист бездротової мережі:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "З'_єднання:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Бездротовий _адаптер:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Я не можу знайти свого провайдера та хочу ввести його _вручну:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Провайдер:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Список країн або областей:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Країна або область"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Дротові"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4339,17 +4692,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Захист бездротової мережі:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_Назва мережі:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "З'_єднання:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Бездротовий _адаптер:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Використання:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4357,7 +4734,7 @@ msgstr ""
 "Ця програма є частиною NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4365,415 +4742,464 @@ msgstr ""
 "Вона не призначена для використання з командного рядка, її слід "
 "використовувати з середовища GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 #, fuzzy
 msgid "HSPA+"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "недоступно"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не зареєстровано"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашня мережа (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Домашня мережа"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "триває пошук"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "реєстрацію заборонено"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s роумінг)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роумінг)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роумінгова мережна (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Роумінгова мережна"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Код PIN для картки SIM «%s» на «%s»"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Вимагається код PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Для використання мобільного широкосмугового пристрою потрібен код PIN"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Мобільне широкосмугове з'єднання «%s» встановлено: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "роумінг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Основне з'єднання:"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Сертифікати DER чи PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Секретні ключі DER, PEM чи PKCS#12 (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Сертифікат C_A:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Виберіть файл PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Файли PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Усі файли"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Анонімно"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Розпізнано"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Обидва"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_Анонімне посвідчення:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "_Файл PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Вн_утрішня автентифікація:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволити автоматичне перед_бачення PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Обрати сертифікат Центру сертифікації..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Версія 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Версія 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "Сертифікат C_A:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "Сертифікат C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Ве_рсія PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-и бітна ключова фраза"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "П_оказати паролі"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Сертифікат C_A:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Сертифікат C_A:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "_Посвідчення:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "ШВИДКО"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Тунельний TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "Захищено EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "Ав_тентифікація:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (типово)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Відкрита система"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Спільний ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (типово)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Ключ:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "П_оказати ключ"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_Індекс WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Тип:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (типово)"
+
+#~ msgid "Ignored"
+#~ msgstr "Зігнорувати"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Не вдалось оновити секрети з'єднання через невідому помилку."
+
+#, fuzzy
+#~ msgid "2:"
+#~ msgstr "2"
+
+#, fuzzy
+#~ msgid "3:"
+#~ msgstr "3"
+
+#, fuzzy
+#~ msgid "4:"
+#~ msgstr "4"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "_Інформація про з'єднання"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Не вдалось імпортувати з'єднання VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Неможливо прочитати файл «%s», або ж він не містить розпізнані відомості "
+#~ "про з'єднання VPN.\n"
+#~ "\n"
+#~ "Помилка: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Невідома помилка"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Обрати сертифікат Центру сертифікації..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "Сертифікат C_A:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Менеджер мережі"
@@ -4810,15 +5236,6 @@ msgstr "_Тип:"
 #~ msgid " "
 #~ msgstr " "
 
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
 #~ msgid "Aut_onegotiate"
 #~ msgstr "_Автоматичне узгодження"
 
@@ -4922,12 +5339,6 @@ msgstr "_Тип:"
 #~ msgid "BSID:"
 #~ msgstr "BSID:"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "Вторинний DNS:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "Трійкове DNS:"
-
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Увімкнути мобільну _радіомережу WiMAX"
 
@@ -4973,12 +5384,6 @@ msgstr "_Тип:"
 #~ msgid "_Save..."
 #~ msgstr "З_берегти..."
 
-#~ msgid "_Import"
-#~ msgstr "_Імпорт"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Підключати _автоматично"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Доступно _всім користувачам"
 
@@ -5011,9 +5416,6 @@ msgstr "_Тип:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Невідомо, як редагувати з'єднання «%s»"
 
-#~ msgid "Failed to create PAN connection: %s"
-#~ msgstr "Не вдалось створити з'єднання PAN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Ваш телефон готовий до роботи!"
 
@@ -5110,9 +5512,6 @@ msgstr "_Тип:"
 #~ msgid "Could not acquire the %s service. (%d)\n"
 #~ msgstr "Не вдається запитати службу %s. (%d)\n"
 
-#~ msgid "translator-credits"
-#~ msgstr "Максим Дзюманенко <dziumanenko@gmail.com>"
-
 #~ msgid ""
 #~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
 #~ msgstr ""
diff --git a/po/ur.po b/po/ur.po
index fc7c128c..6a1e97f5 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2010-04-06 22:47+0500\n"
 "Last-Translator: Muhammad Ali Makki <makkiabufaris@aol.com>\n"
 "Language-Team: urducoder.com <makkiabufaris@aol.com>\n"
@@ -19,39 +20,48 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "ن_یٹ ورک:"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "اپنے نیٹ ورک اتصال کی ادارت کریں"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "نیٹ ورک اتصال"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "VPN-Konfigurationsfehler"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "اپنے نیٹ ورک اتصال کی تبدیلی اور ادارت کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "متصل اطلاعات کو معطل کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 #, fuzzy
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "غیر متصل اطلاعات کو معطل کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
@@ -59,12 +69,12 @@ msgstr ""
 "نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
 "کردیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 #, fuzzy
 msgid "Disable VPN notifications"
 msgstr "متصل اطلاعات کو معطل کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when connecting to or "
@@ -73,32 +83,33 @@ msgstr ""
 "نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
 "کردیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "زیریں نیٹ ورکس دستیابی اطلاعات"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 #, fuzzy
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "وائیرلیس نیٹ ورک کی دستیابی پر اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "مہر"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "یہ جاننے کے لیے استعمال ہوتا ہے کہ آیا ترتیبات نئے نسخے پر منتقل کی جانی "
 "چاہئیں یا نہیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Wi-Fi کو بنانا معطل کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 #, fuzzy
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
@@ -106,163 +117,176 @@ msgstr ""
 "ایپلیٹ کے استعمال کے دوران adhoc نیٹ ورک کو بننے سے روکنے کے لیے اسے TRUE "
 "کردیں."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 #, fuzzy
 msgid "Ignore CA certificate"
 msgstr "CA سند منتخب کریں"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "نیٹ ورک منیجر"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "کوئی نیٹ ورک اتصال نہیں"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "نیٹ ورک منیجر ایپلیٹ"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 #, fuzzy
 msgid "802.1X authentication"
 msgstr "وائیرڈ 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "_متصل ہوں"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "_نیٹ ورک کا نام:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Verbindung konnte nicht aktualisiert werden"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 #, fuzzy
 msgid "Unknown error"
 msgstr "نامعلوم"
 
 #
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 #, fuzzy
 msgid "Connection failure"
 msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "غیر متصل"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "غیر متصل"
 
 #
-#: ../src/applet.c:470
+#: src/applet.c:481
 #, fuzzy
 msgid "Connection activation failed"
 msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "یہ پیغام دوبارہ مت دکھائیں"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -272,7 +296,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' منقطع ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -282,7 +306,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -292,7 +316,7 @@ msgstr ""
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس غیر متوقعہ طور پر بند "
 "ہوگئی."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -303,7 +327,7 @@ msgstr ""
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس نے ناموزوں وضع کاری "
 "لوٹائی ہے."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -313,7 +337,7 @@ msgstr ""
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ اتصال قائم کرنے کی کوششوں کا وقت "
 "تمام ہوگیا."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -322,7 +346,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس وقت پر نہیں چلی."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -331,7 +355,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس چلنے میں ناکام ہوگئی."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -340,7 +364,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا کیونکہ کوئی موزوں وی پی این سیکرٹس نہیں ہیں."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -349,7 +373,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا جی کی وجہ نا موزوں وی پی این سیکرٹس ہیں."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -358,7 +382,7 @@ msgstr ""
 "\n"
 "وی پی این اتصال '%s' ناکام ہوگیا."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -366,20 +390,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "وی پی این لاگ ان پیغام"
 
 #
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "وی پی این اتصال ناکام"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -393,7 +417,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -406,600 +430,631 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 #, fuzzy
 msgid "device not ready (firmware missing)"
 msgstr "ڈیوائس تیار نہیں ہے"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "ڈیوائس تیار نہیں ہے"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "غیر متصل"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "غیر متصل"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "ڈیوائس کی ادارت نہیں کی گئی"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "کوئی نیٹ ورک ڈیوائس دستیاب نہیں ہے"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_وی پی این اتصال"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "وی پی این _وضع کریں..."
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Neue VPN-Verbindung erstellen"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "نیٹ ورکنگ معطل ہے"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "_نیٹ ورکنگ فعال کریں"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "_وائیرلیس فعال کریں"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "_موبائل براڈ بینڈ فعال کریں"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "_اطلاعات فعال کریں"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "اتصال کی _معلومات"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "اتصال مدون کریں..."
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_بابت"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "آپ '%s' سے متصل ہیں."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "غیر متصل"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "نیٹ ورک اتصال منقطع کردیا گیا ہے."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "نیٹ ورک اتصال '%s' کے لیے صارف کی توثیق درکار ہے."
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "درخواست برائے نیٹ ورک '%s' بھیجی جارہی ہے..."
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "نیٹ ورک اتصال '%s' فعال ہے"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "وی پی این اتصال '%s' چلایا جارہا ہے..."
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "وی پی این اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "'%s' کے لیے وی پی این پتہ کی درخواس کی جارہی ہے..."
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "وی پی این اتصال '%s' فعال ہے"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "کوئی نیٹ ورک اتصال نہیں"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "نیٹ ورک منیجر ایپلیٹ"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "موبائل براڈ بینڈ (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "موبائل براڈ بینڈ"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "دستیاب"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "نیا موبائل براڈ بینڈ اتصال"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "اتصال قائم ہوگیا"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 #, fuzzy
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "آپ اس وقت موبائل براڈ بینڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "موبائل براڈ بینڈ نیٹ ورک پاس ورڈ"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 #, fuzzy
 msgid "You are now registered on the home network."
 msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 #, fuzzy
 msgid "You are now registered on a roaming network."
 msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "آپ اس وقت موبائل براڈ بینڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "موبائل براڈ بینڈ اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "موبائل براڈ بینڈ اتصال '%s' وضع کیا جارہا ہے..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "موبائل براڈ بینڈ اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "موبائل براڈ بینڈ اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "خودکار ایتھرنیٹ (Ethernet)"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "وائیرڈ نیٹ ورکس (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "وائیرڈ نیٹ ورکس"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "وائیرڈ نیٹ ورک"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 #, fuzzy
 msgid "You are now connected to the ethernet network."
 msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "وائیرڈ نیٹ ورک پتہ کی درخواست برائے '%s' کی جارہی ہے..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ڈی ایس ایل DSL توثیق"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(کچھ نہیں)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "نیا اتصال مدون نہیں ہوسکتا"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "وائیرڈ نیٹ ورکس (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "وائیرڈ نیٹ ورک"
 msgstr[1] "وائیرڈ نیٹ ورک"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 #, fuzzy
 msgid "Wi-Fi is disabled"
 msgstr "وائیرلیس معطل ہے"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "مزید نیٹ ورک"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 #, fuzzy
 msgid "Wi-Fi Networks Available"
 msgstr "وائیرلیس نیٹ ورک دستیاب ہیں"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "وائیرلیس نیٹ ورک سے متصل ہونے کے لیے اس آئکن پر کلک کریں"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "اب آپ وائیرلیس نیٹ ورک '%s' سے متصل ہیں."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "وائیرلیس نیٹ ورک '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "درخواست برائے نیٹ ورک '%s' بھیجی جارہی ہے..."
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "وائیرلیس نیٹ ورک اتصال '%s' فعال ہے: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Verbindung konnte nicht aktualisiert werden"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "اتصال کی معلومات دکھانے میں غلطی:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "حرکی WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "_میک MAC پتہ:"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 #, fuzzy
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/applet-dialogs.c:260
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "طے شدہ"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u م.ب/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 #, fuzzy
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "نامعلوم"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 #, fuzzy
 msgctxt "Address"
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "آئی پی پتہ"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "نشریہ پتہ"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 #, fuzzy
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "سب-نیٹ ماسک"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "ابتدائی DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "ثانوی DNS:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "ثانوی DNS:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ایتھرنیٹ (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "مواجہ"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "ہارڈویئر پتہ"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "ڈرائیور"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "رفتار"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "سیکورٹی:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "طے شدہ راؤٹ"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
 #, fuzzy
-msgid "Ignored"
-msgstr "نظر انداز کریں"
+msgid "Password"
+msgstr "پاس ورڈ:"
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:878
 #, fuzzy
 msgid "VPN Type"
 msgstr "Schlüsseltyp:"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 #, fuzzy
 msgid "VPN Gateway"
 msgstr "گیٹ وے"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 #, fuzzy
 msgid "VPN Username"
 msgstr "صا_رف کا نام:"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "ا_تصال:"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "نامعلوم"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "کوئی موزوں فعال اتصال نہیں پائے گئے!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 "حق اشاعت © 2004-2008 ریڈ ہیٹ, Inc.\n"
 "حق اشاعت © 2005-2008 نوویل, Inc."
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "آپ کے نیٹ ورک آلوں اور اتصال کی ادارت کے لیے اطلاعی علاقہ ایپلیٹ"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "نیٹ ورک منیجر ویب سائٹ"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+"محمد علی مکی <makkiabufaris@aol.com>\n"
+"مکی کا بلاگ <http://makki.urducoder.com>\n"
+"اردو کوڈر لینکس فورم <http://www.urducoder.com>"
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -1008,35 +1063,35 @@ msgstr ""
 "نیٹ ورک منیجر ایپلیٹ کچھ درکار وسائل تلاش نہیں کر پا رہا (گلیڈ glade فائل "
 "نہیں مل سکی)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "مفقود وسائل"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "موبائل براڈ بینڈ نیٹ ورک پاس ورڈ"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "پاس ورڈ:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 #, fuzzy
 msgid "SIM PIN unlock required"
 msgstr "پِن PIN کوڈ درکار ہے"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 #, fuzzy
 msgid "SIM PIN Unlock Required"
 msgstr "پِن PIN کوڈ درکار ہے"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1044,28 +1099,28 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 #, fuzzy
 msgid "PIN code:"
 msgstr "پِن PIN کوڈ درکار ہے"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 #, fuzzy
 msgid "SIM PUK unlock required"
 msgstr "پَک PUK کوڈ درکار ہے"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 #, fuzzy
 msgid "SIM PUK Unlock Required"
 msgstr "پَک PUK کوڈ درکار ہے"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1073,36 +1128,43 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 #, fuzzy
 msgid "PUK code:"
 msgstr "پَک PUK کوڈ درکار ہے"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "اتصال کی معلومات"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Verbindung konnte nicht aktualisiert werden"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1111,43 +1173,43 @@ msgstr ""
 "آئی پی پتے نیٹ ورک پر آپ کے کمپیوٹر کی پہچان ہوتے ہیں.  کوئی آئی پی پتہ شامل "
 "کرنے کے لیے \"شامل کریں\" کے بٹن پر کلک کریں"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 #, fuzzy
 msgid "_Delete"
 msgstr "حذف"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "خودکار حاصل ہونے والے روٹ _نظر انداز کریں"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "یہ ا_تصال صرف اس کے اپنے نیٹ ورک کے وسائل کے لیے استعمال کریں"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1155,17 +1217,17 @@ msgstr ""
 "اگر فعال کیا گیا تو یہ اتصال کبھی بھی طے شدہ نیٹ ورک اتصال کے طور پر استعمال "
 "نہیں کیا جائے گا."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "بنائیں..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Eine UTMS-Verbindung erstellen"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1180,651 +1242,803 @@ msgstr ""
 "فہرست میں موجود نہ ہو تو ممکنہ طور پر آپ کے پاس درست وی پی این پلگ ان نصب "
 "نہیں ہے."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_سروس:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 #, fuzzy
 msgid "Broadcast"
 msgstr "نشریہ پتہ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 #, fuzzy
 msgid "ARP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "ا_تصال:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "انداز:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 #, fuzzy
 msgid "_Edit"
 msgstr "تدوین"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
-msgid "_Interface name:"
+msgid "_Interface name"
 msgstr "مواجہ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
-msgid "_Primary:"
+msgid "_Primary"
 msgstr "ابتدائی DNS:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "بائٹس"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
-msgid "_Priority:"
+msgid "_Priority"
 msgstr "_سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "_نیٹ ورکنگ فعال کریں"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "خودکار"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "طے شدہ"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "_میک MAC پتہ:"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "پتہ"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "ہارڈویئر پتہ:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "کوئی بھی ڈیوائس"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "نا معلوم غلطی کی وجہ سے اتصال کے سیکرٹس کی تجدید نہیں ہوسکتی."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "اس اتصال کے لیے 802.1X سیکورٹی استعمال کریں"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "صا_رف کا نام:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_سروس:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "پاس ورڈ د_کھائیں"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_پاس ورڈ:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "مواجہ"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "مواجہ:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "مواجہ:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 #, fuzzy
 msgid "10 Mb/s"
 msgstr "م.ب/س"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 #, fuzzy
 msgid "100 Mb/s"
 msgstr "%u م.ب/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "نظر انداز کریں"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "دستی"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
-msgstr "_پورٹ:"
-
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
-msgid "_Device:"
-msgstr "_سروس:"
+msgid "_Port"
+msgstr "_پورٹ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "_میک MAC پتہ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_نجی کلید پاس ورڈ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "طے شدہ"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "نظر انداز کریں"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "نشریہ پتہ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_نجی کلید پاس ورڈ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_رفتار:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "بھرپور _دو جُزی"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 ""
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "ہاں"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "نہیں"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 #, fuzzy
 msgid "All _users may connect to this network"
 msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "اتصال کی _معلومات"
+msgid "_Metered connection"
+msgstr "ا_تصال:"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "_خودکار متصل ہوں"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1833,7 +2047,7 @@ msgstr ""
 "آئی پی پتے نیٹ ورک پر آپ کے کمپیوٹر کی پہچان ہوتے ہیں.  کوئی آئی پی پتہ شامل "
 "کرنے کے لیے \"شامل کریں\" کے بٹن پر کلک کریں"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1841,130 +2055,133 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "خودکار، صرف پتے"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 #, fuzzy
 msgid "Addresses"
 msgstr "پتہ"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 #, fuzzy
 msgid "Connected"
 msgstr "_متصل ہوں"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "_سروس:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "ایتھرنیٹ (%s)"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 #, fuzzy
 msgid "Link-Local"
 msgstr "صرف لنک-لوکل"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "دوسرے کمپوٹروں سے شیئر کردہ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_اسلوب:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1975,8 +2192,8 @@ msgstr ""
 "کے کمپیوٹر کی وضع کاری کر سکے. اگر آپ DHCP موکل شناخت کنندہ استعمال کرنا "
 "چاہیں تو اسے یہاں داخل کریں."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1984,26 +2201,26 @@ msgstr ""
 "ڈومین نام جو ہوسٹ ناموں کو حل کرنے کے لیے استعمال ہوں گے. متعدد ڈومینوں کو "
 "کوما سے الگ کریں."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "DHCP _موکل آئی ڈی:"
 
-#: ../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
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
-msgid "S_earch domains:"
+msgid "S_earch domains"
 msgstr "_تلاش کے ڈومین:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_ڈی این ایس سرور:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2011,35 +2228,44 @@ msgstr ""
 "ڈومین نیم سروروں کے آئی پی پتے ہوسٹ ناموں کو حل کرنے کے لیے استعمال ہوتے "
 "ہیں. متعدد ڈومین نیم سرور پتوں کو کوما سے الگ کریں."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "_روٹس..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -2049,772 +2275,877 @@ msgstr ""
 "ڈومین نیم سروروں کے آئی پی پتے ہوسٹ ناموں کو حل کرنے کے لیے استعمال ہوتے "
 "ہیں. متعدد ڈومین نیم سرور پتوں کو کوما سے الگ کریں."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "میٹرک"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_درآمد"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_نمبر:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 #, fuzzy
 msgid "Advanced"
 msgstr "<b>اعلی</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
-msgid "N_etwork ID:"
+msgid "N_etwork ID"
 msgstr "ن_یٹ ورک:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "تبدیل کریں..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "پاس ورڈ _دکھائیں"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 #, fuzzy
 msgid "Authentication"
 msgstr "_توثیق:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "مجاز اسلوب:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "ا_سلوب وضع کریں..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 #, fuzzy
 msgid "Compression"
 msgstr "<b>دباؤ</b>"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "پوائینٹ ٹو پوائینٹ رمز نگاری (MPPE) اس_تعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "128-بِٹ رمز نگاری _درکار"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "stateful MPPE _استعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "_بی ایس ڈی BSD ڈیٹا دباؤ"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "_ڈیفلیٹ Deflate ڈیٹا دباؤ کی اجازت دیں"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "ٹی سی پی TCP ہیڈر دباؤ استعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "پی پی پی _ایکو پیکٹ ارسال کریں"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_اسلوب:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_اسلوب:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "<b>اعلی</b>"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "وائیرڈ نیٹ ورکس"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "_سیکورٹی:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "_سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "_سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "نجی _کلید:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
-msgstr ""
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+#, fuzzy
+msgid "Edit _JSON configuration"
+msgstr "VPN-Konfigurationsfehler"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "VPN-Konfigurationsfehler"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "_سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "ایتھرنیٹ (%s)"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "ا_تصال:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 #, fuzzy
 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "TKIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "ہارڈویئر پتہ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "ہارڈویئر پتہ:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "_سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "ترسیلی قوت:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "ترسیلی قوت:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
-msgid "_Parent interface:"
+msgid "_Parent interface"
 msgstr "مواجہ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
-msgstr ""
+#: src/connection-editor/ce-page-vlan.ui:41
+#, fuzzy
+msgid "VLAN inter_face name"
+msgstr "مواجہ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "_میک MAC پتہ:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
-msgid "S_ecurity:"
+msgid "S_ecurity"
 msgstr "سیکورٹی:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "ترسیلی قوت:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "م.ب/س"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_ریٹ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_چینل:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "ب_ینڈ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 #, fuzzy
 msgid "No polkit authorization to perform the action"
 msgstr "PolicyKit-Legitimierung konnte nicht erzeugt werden."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 #, fuzzy
 msgid "Allowed Authentication Methods"
 msgstr "<b>جائز توثیقی طریقے</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "وسعت پذیر توثیقی پروٹوکول"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "پاس ورڈ توثیقی پروٹوکول"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "چلینج ہینڈ شیک توثیقی پروٹوکول"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول نسخہ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2824,451 +3155,491 @@ msgstr ""
 "معاونت کرے گا.  اگر اتصال ناکام ہوجائے، تو کچھ اسلوبوں کی معاونت معطل کر کے "
 "دیکھیں.</i>"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"وی پی این پلگ ان وی پی این اتصال کو درست طور پر درآمد کرنے میں ناکام ہوگیا\n"
-"\n"
-"غلطی: کوئی وی پی این سروس نوعیت نہیں."
-
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "وی پی این اتصال درآمد نہیں ہوسکتا"
 
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"فائل '%s' نہیں پڑھی جاسکتی یا اس میں جانی پہچانی وی پی این اتصال کی معلومات "
-"نہیں ہیں\n"
+"وی پی این پلگ ان وی پی این اتصال کو درست طور پر درآمد کرنے میں ناکام ہوگیا\n"
 "\n"
-"غلطی: %s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "نامعلوم غلطی ہوئی ہے."
+"غلطی: کوئی وی پی این سروس نوعیت نہیں."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "درآمد کرنے کے لیے فائل منتخب کریں"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 #, fuzzy
 msgid "Hardware"
 msgstr "ہارڈویئر پتہ:"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "وی پی این اتصال برآمد کریں..."
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "نامعلوم غلطی کی بناء پر اتصال مدون ڈائیلاگ تیار نہیں ہوسکا."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "نیا اتصال نہیں بنایا جاسکتا"
 
 #
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "اتصال حذف کرنے میں ناکامی"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "کیا آپ واقعی اتصال %s کو حذف کرنا چاہتے ہیں؟"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_وی پی این اتصال"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "پتہ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "نیٹ ماسک"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "گیٹ وے"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "میٹرک"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "پریفکس"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "تدوین %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "بغیر-نام کے اتصال کی تدوین"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "اتصال کا _نام:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "مدون کی تیاری میں غلطی"
 
 #
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "اتصال مدون کو کچھ درکار وسائل نہیں مل رہے (گلیڈ glade فائل نہیں ملی)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "اس اتصال کو اس مشین کے تمام صارفین کے لیے محفوظ کرنے کی تصدیق."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 #, fuzzy
 msgid "Could not create connection"
 msgstr "نیا اتصال نہیں بنایا جاسکتا"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "اتصال مدون نہیں ہوسکتا"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "اتصال مدون کا ڈائیلاگ بنانے میں غلطی."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "مدون کی تیاری میں غلطی"
 
 #
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "اتصال کا _نام:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "برآمد"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "کبھی نہیں"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "ابھی"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d منٹ پہلے"
 msgstr[1] "%d منٹ پہلے"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d گھنٹہ پہلے"
 msgstr[1] "%d گھنٹے پہلے"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d دن پہلے"
 msgstr[1] "%d دنوں پہلے"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d مہینہ پہلے"
 msgstr[1] "%d مہینوں پہلے"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d سال پہلے"
 msgstr[1] "%d سال پہلے"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "اتصال کا اضافہ ناکام ہوگیا"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "وائیرڈ اتصال %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "وائیرڈ اتصال %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "نام"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "آخری استعمال"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "منتخب کردہ اتصال مدون کریں"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "منتخب کردہ اتصال کی تدوین کی توثیق"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "منتخب کردہ اتصال حذف کریں"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "منتخب کردہ اتصال کو حذف کرنے کی توثیق"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "موبائل براڈ بینڈ اتصال کی نوعیت معاونت شدہ نہیں ہے."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "نیا اتصال نہیں بنایا جاسکتا"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 #, fuzzy
 msgid "Error creating connection"
 msgstr "اتصال مدون کا ڈائیلاگ بنانے میں غلطی."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "اتصال کا اضافہ ناکام ہوگیا"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "نیا اتصال نہیں بنایا جاسکتا"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "نیٹ ورک اتصال"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Neue VPN-Verbindung erstellen"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X سیکورٹی"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 #, fuzzy
 msgid "Could not load 802.1X Security user interface."
 msgstr "وائی فائی Wi-Fi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "اس اتصال کے لیے 802.1X سیکورٹی استعمال کریں"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "_Am Netzwerk anmelden"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "وائیرلیس نیٹ ورک"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "ابتدائی DNS:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, fuzzy, c-format
 msgid "Bond connection %d"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, fuzzy, c-format
 msgid "Bridge connection %d"
 msgstr "وائیرڈ اتصال %d"
@@ -3276,90 +3647,94 @@ msgstr "وائیرڈ اتصال %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "ڈی ایس ایل DSL صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "ڈی ایس ایل DSL صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "مواجہ:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "ڈی ایس ایل اتصال %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "نظر انداز کریں"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "ایتھرنیٹ (%s)"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, fuzzy, c-format
 msgid "Ethernet connection %d"
 msgstr "وائیرڈ اتصال %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "طے شدہ"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3367,187 +3742,189 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Wi-Fi صارف مواجہ لوڈ نہیں ہوسکتا"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
 msgid "InfiniBand connection %d"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "IPv4 صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "خودکار (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "خودکار (VPN) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "خودکار، صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "خودکار (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "خودکار (PPPoE) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "خودکار (DHCP) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "صرف لنک-لوکل"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
-msgid "Additional DNS ser_vers:"
+msgid "Additional DNS ser_vers"
 msgstr "_ڈی این ایس سرور:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
-msgid "Additional s_earch domains:"
+msgid "Additional s_earch domains"
 msgstr "_تلاش کے ڈومین:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "تدوین IPv4 روٹس برائے %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 ترتیبات"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 #, fuzzy
 msgid "Automatic, DHCP only"
 msgstr "خودکار (DHCP)"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "تدوین IPv6 روٹس برائے %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 ترتیبات"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 صارف مواجہ لوڈ نہیں ہوسکتا"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "ڈی ایس ایل DSL صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "UTMS-Verbindung %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "موبائل براڈ بینڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "موبائل براڈ بینڈ اتصال کی نوعیت معاونت شدہ نہیں ہے."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "موبائل براڈ بینڈ فراہم کُنندہ کی نوعیت منتخب کریں"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3556,7 +3933,7 @@ msgstr ""
 "وہ ٹیکنالوجی منتخب کریں جو آپ کا موبائل براڈ بینڈ فراہم کُنندہ استعمال کرتا "
 "ہے. اگر آپ پُر یقین نہیں ہیں، اپنے فراہم کُنندہ سے رابطہ کریں."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "میرا فراہم کُنندہ _جی ایس ایم پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے GPRS, "
@@ -3564,86 +3941,82 @@ msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "میرا فراہم کُنندہ سی ڈی ایم اے پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے 1xRTT, "
 "EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "کچھ نہیں"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "تدوین PPP توثیقی اسلوب برائے %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP ترتیبات"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "پی پی پی PPP صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "وائیرڈ اتصال %d"
@@ -3651,11 +4024,11 @@ msgstr "وائیرڈ اتصال %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
@@ -3663,62 +4036,62 @@ 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "کوئی نیٹ ورک اتصال نہیں"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 #, fuzzy
 msgid "Could not load vlan user interface."
 msgstr "IPv4 صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, fuzzy, c-format
 msgid "VLAN connection %d"
 msgstr "وی پی این اتصال %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-#, fuzzy
-msgid "Could not load VPN user interface."
-msgstr "پی پی پی PPP صارف مواجہ لوڈ نہیں ہوسکتا."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "'%s' کے لیے وی پی این پلگ ان سروس نہیں پائی گئی."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "'%s' کے لیے وی پی این پلگ ان سروس نہیں پائی گئی."
 
 #
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "پی پی پی PPP صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "'%s' کے لیے وی پی این پلگ ان سروس نہیں پائی گئی."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "وی پی این اتصال %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Neue VPN-Verbindungen erstellen - 1 von 2"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3732,115 +4105,113 @@ msgstr ""
 "فہرست میں موجود نہ ہو تو ممکنہ طور پر آپ کے پاس درست وی پی این پلگ ان نصب "
 "نہیں ہے."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 #, fuzzy
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi صارف مواجہ لوڈ نہیں ہوسکتا"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "کوئی بھی ڈیوائس"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, fuzzy, c-format
 msgid "Wi-Fi connection %d"
 msgstr "وائیرڈ اتصال %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 #, fuzzy
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "حرکی WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ذاتی"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 انٹرپرائز"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "وائی فائی Wi-Fi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا، Wi-Fi ترتیاب مفقود ہے."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 #, fuzzy
 msgid "Wi-Fi Security"
 msgstr "وائیرلیس سیکورٹی"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "وائی فائی Wi-Fi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "فائل \"%s\" پہلے ہی موجود ہے."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_بدل دیں"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "کیا آپ %s کو اس وی پی این اتصال سے بدلنا چاہتے ہیں جسے آپ محفوظ کرنے جارہے "
 "ہیں؟"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "وی پی این اتصال برآمد نہیں ہوسکتا"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3851,463 +4222,423 @@ msgstr ""
 "\n"
 "غلطی: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "وی پی این اتصال برآمد کریں..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "اتصال کی معلومات"
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "نیٹ ورک اتصال"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "CA _سند:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "نجی _کلید:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_نجی کلید پاس ورڈ:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "_صارف سند:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-"آپ کا موبائل براڈ بینڈ اتصال مندرجہ ذیل ترتیبات کے ساتھ وضع کیا گیا ہے:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "میرا ملک فہرست میں نہیں ہے"
 
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "آپ کی ڈیوائس:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr "غیر درج شدہ"
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "آپ کا فراہم کُنندہ:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+#, fuzzy
+msgid "My plan is not listed…"
+msgstr "میرا پلان درجِ فہرست نہیں ہے..."
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "آپ کا پلان:"
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
+msgstr "فراہم کُنندہ"
 
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
+msgstr "نصب شدہ GSM ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
+msgstr "نصب شدہ CDMA ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "کوئی بھی ڈیوائس"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "نیا موبائل براڈ بینڈ اتصال"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
-"اب آپ کی منتخب کردہ ترتیبات کو استعمال کرتے ہوئے آپ کے براڈ بینڈ فراہم کُنندہ "
-"سے اتصال قائم کیا جائے گا. اگر تصال ناکام ہوجائے یا آپ نیٹ ورک وسائل تک "
-"رسائی حاصل نہ کرسکیں تو اپنی ترتیبات دوبارہ چیک کریں. اپنے موبائل براڈ بینڈ "
-"اتصال میں تبدیلی کے لیے نظام >> ترجیحات کی فہرست سے \"نیٹ ورک اتصال\" منتخب "
-"کریں."
+"یہ مددگار سیلولر (3G) نیٹ ورک سے موبائل براڈ بینڈ اتصال مرتب کرنے میں آپ کی "
+"مدد کرے گا."
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "موبائل براڈ بینڈ کی ترتیبات کی تصدیق کریں"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr "آپ کو ذیل کی معلومات درکار ہوں گی:"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
-msgstr "غیر درج شدہ"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+#, fuzzy
+msgid "Your broadband provider’s name"
+msgstr "آپ کے براڈ بینڈ فراہم کُنندہ کا نام"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "اپنا پلان _منتخب کریں:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr "آپ کے فراہم کُنندہ کے بِلِنگ پلان کا نام"
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "منتخب کردہ پلان _APN (Access Point Name):"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+msgstr "(کچھ صورتوں میں) آپ کا براڈ بینڈ بِلِنگ پلان APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"انتباہ: غلط پلان کے انتخاب سے آپ کے براڈ بینڈ اتصال سے بِلِنگ کے مسائل پیدا "
-"ہوسکتے ہیں یا ممکنہ طور پر آپ کی متصلی بند کی جاسکتی ہے\n"
-"\n"
-"اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے اپنے "
-"پلان کے APN کے لیے کہیں."
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
+msgstr "ا_س موبائل براڈ بینڈ ڈیوائس کے لیے اتصال بنائیں:"
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "اپنا بِلِنگ پلان منتخب کریں"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
+msgstr "موبائل براڈ بینڈ اتصال مرتب کریں"
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.ui:189
 #, fuzzy
-msgid "My plan is not listed…"
-msgstr "میرا پلان درجِ فہرست نہیں ہے..."
+msgid "Country or region:"
+msgstr "ممالک فہرست:"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "اپنے فراہم کُنندہ کا ملک منتخب کریں"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "اپنا فراہم کُنندہ _فہرست میں سے منتخب کریں:"
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
-msgstr "فراہم کُنندہ"
-
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
-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 set up the connection _manually:"
 msgstr ""
 "میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا "
 "چاہتا ہوں:"
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "فراہم کُنندہ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 "میرا فراہم کُنندہ GSM ٹیکنالوجی استعمال کرتا ہے (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "میرا فراہم کُنندہ CDMA ٹیکنالوجی استعمال کرتا ہے (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "اپنا فراہم کُنندہ منتخب کریں"
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-#, fuzzy
-msgid "Country or Region List:"
-msgstr "ممالک فہرست:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-#, fuzzy
-msgid "Country or region"
-msgstr "ممالک فہرست:"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "اپنا پلان _منتخب کریں:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "میرا ملک فہرست میں نہیں ہے"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "منتخب کردہ پلان _APN (Access Point Name):"
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "اپنے فراہم کُنندہ کا ملک منتخب کریں"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
-msgstr "نصب شدہ GSM ڈیوائس"
-
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
-msgstr "نصب شدہ CDMA ڈیوائس"
-
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"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."
 msgstr ""
-"یہ مددگار سیلولر (3G) نیٹ ورک سے موبائل براڈ بینڈ اتصال مرتب کرنے میں آپ کی "
-"مدد کرے گا."
-
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
-msgstr "آپ کو ذیل کی معلومات درکار ہوں گی:"
+"انتباہ: غلط پلان کے انتخاب سے آپ کے براڈ بینڈ اتصال سے بِلِنگ کے مسائل پیدا "
+"ہوسکتے ہیں یا ممکنہ طور پر آپ کی متصلی بند کی جاسکتی ہے\n"
+"\n"
+"اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے اپنے "
+"پلان کے APN کے لیے کہیں."
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-#, fuzzy
-msgid "Your broadband provider’s name"
-msgstr "آپ کے براڈ بینڈ فراہم کُنندہ کا نام"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "اپنا بِلِنگ پلان منتخب کریں"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
-msgstr "آپ کے فراہم کُنندہ کے بِلِنگ پلان کا نام"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"آپ کا موبائل براڈ بینڈ اتصال مندرجہ ذیل ترتیبات کے ساتھ وضع کیا گیا ہے:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(کچھ صورتوں میں) آپ کا براڈ بینڈ بِلِنگ پلان APN (Access Point Name)"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "آپ کی ڈیوائس:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
-msgstr "ا_س موبائل براڈ بینڈ ڈیوائس کے لیے اتصال بنائیں:"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "آپ کا فراہم کُنندہ:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "کوئی بھی ڈیوائس"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "آپ کا پلان:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
-msgstr "موبائل براڈ بینڈ اتصال مرتب کریں"
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"اب آپ کی منتخب کردہ ترتیبات کو استعمال کرتے ہوئے آپ کے براڈ بینڈ فراہم کُنندہ "
+"سے اتصال قائم کیا جائے گا. اگر تصال ناکام ہوجائے یا آپ نیٹ ورک وسائل تک "
+"رسائی حاصل نہ کرسکیں تو اپنی ترتیبات دوبارہ چیک کریں. اپنے موبائل براڈ بینڈ "
+"اتصال میں تبدیلی کے لیے نظام >> ترجیحات کی فہرست سے \"نیٹ ورک اتصال\" منتخب "
+"کریں."
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "نیا موبائل براڈ بینڈ اتصال"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "موبائل براڈ بینڈ کی ترتیبات کی تصدیق کریں"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(کچھ نہیں)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "CA _سند:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "نامعلوم"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 #, fuzzy
 msgid "Select"
 msgstr "فائل منتخب کریں"
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 #, fuzzy
 msgid "Cancel"
 msgstr "gtk-cancel"
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 #, fuzzy
 msgid "Select from file…"
 msgstr "فائل منتخب کریں"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "_صارف سند:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 #, fuzzy
-msgid "_Secondary Password:"
-msgstr "_پاس ورڈ:"
+msgid "Sh_ow passwords"
+msgstr "پاس ورڈ _دکھائیں"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "_پاس ورڈ:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 #, fuzzy
-msgid "Sh_ow passwords"
-msgstr "پاس ورڈ _دکھائیں"
+msgid "_Secondary Password:"
+msgstr "_پاس ورڈ:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_پاس ورڈ:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Verbindung konnte nicht verschoben werden"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 #, fuzzy
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "حرکی WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_بنائیں"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 "وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "وائیرلیس نیٹ ورک توثیق درکار"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "توثیق درکار از وائیرلیس نیٹ ورک"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 #, fuzzy
 msgid "Create New Wi-Fi Network"
 msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "نیا وائیرلیس نیٹ ورک"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نئے وائیرلیس نیٹ ورک کا نام لکھیں جو آپ بنانا چاہتے ہیں."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 #, fuzzy
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 #, fuzzy
 msgid "Hidden Wi-Fi network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
@@ -4316,37 +4647,59 @@ msgstr ""
 "اس پوشیدہ وائیرلیس نیٹ ورک کا نام اور سیکورٹی تفصیلات داخل کریں جس سے آپ "
 "متصل ہونے چاہتے ہیں."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
-msgid "Wi-Fi _security:"
+msgid "Wi-Fi _security"
 msgstr "_وائیرلیس سیکورٹی:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "ا_تصال:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "وائیرلیس ا_ڈاپٹر:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+"میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا "
+"چاہتا ہوں:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "فراہم کُنندہ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
+msgstr "ممالک فہرست:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ممالک فہرست:"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "وائیرڈ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4356,17 +4709,41 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_وائیرلیس سیکورٹی:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "_نیٹ ورک کا نام:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "ا_تصال:"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "وائیرلیس ا_ڈاپٹر:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "استعمال:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4374,7 +4751,7 @@ msgstr ""
 "یہ اطلاقیہ نیٹ ورک منیجر کا ایک جُز ہے (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4382,380 +4759,378 @@ msgstr ""
 "اسے کمانڈ لائن تعامل میں چلانا مقصود نہیں، اس کے برعکس یہ گنوم ڈیسک ٹاپ "
 "ماحول میں چلانے کے لیے ہے."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "مزید نیٹ ورک"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "مزید نیٹ ورک"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "پِن PIN کوڈ درکار ہے"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "موبائل براڈ بینڈ ڈیوائس کے لیے پِن PIN کوڈ درکار ہے"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "موبائل براڈ بینڈ اتصال '%s' فعال ہے"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "ڈی ایس ایل اتصال %d"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER یا PEM اسناد (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 #, fuzzy
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, or PKCS#12 نجی کلیدیں (*.der, *.pem, *.p12)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "CA _سند:"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 #, fuzzy
 msgid "Anonymous"
 msgstr "_نامعلوم پہچان:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 #, fuzzy
 msgid "Authenticated"
 msgstr "_توثیق:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "_نامعلوم پہچان:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
-msgid "_Inner authentication:"
+msgid "_Inner authentication"
 msgstr "داخلی توثیق:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "سند اتھارٹی سند منتخب کریں..."
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "CA _سند:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 #, fuzzy
 msgid "No CA certificate is _required"
 msgstr "CA _سند:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
-msgid "PEAP _version:"
+msgid "PEAP _version"
 msgstr "_PEAP نسخہ:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "_Passwort:"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "Passphrase anzeigen"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "CA _سند:"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "CA _سند:"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "شناخت:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "محفوظ EAP (PEAP)"
 
-#: ../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
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
-msgid "Au_thentication:"
+msgid "Au_thentication"
 msgstr "_توثیق:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
+msgid "Open System"
+msgstr "Offenes System"
+
+#: src/wireless-security/ws-wep-key.ui:15
+msgid "Shared Key"
+msgstr "Gemeinsamer Schlüssel (PSK)"
+
+#: src/wireless-security/ws-wep-key.ui:26
 #, fuzzy
 msgid "1 (Default)"
 msgstr ""
@@ -4764,42 +5139,85 @@ msgstr ""
 "3\n"
 "4"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Open System"
-msgstr "Offenes System"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "Shared Key"
-msgstr "Gemeinsamer Schlüssel (PSK)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_کلید:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "کلید _دکھائیں"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP inde_x:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_نوعیت:"
 
 #, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "طے شدہ"
+
+#, fuzzy
+#~ msgid "Ignored"
+#~ msgstr "نظر انداز کریں"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "نا معلوم غلطی کی وجہ سے اتصال کے سیکرٹس کی تجدید نہیں ہوسکتی."
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "اتصال کی _معلومات"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "وی پی این اتصال درآمد نہیں ہوسکتا"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "فائل '%s' نہیں پڑھی جاسکتی یا اس میں جانی پہچانی وی پی این اتصال کی "
+#~ "معلومات نہیں ہیں\n"
+#~ "\n"
+#~ "غلطی: %s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "نامعلوم غلطی ہوئی ہے."
+
+#, fuzzy
+#~ msgid "Active Network Connections"
+#~ msgstr "نیٹ ورک اتصال"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "سند اتھارٹی سند منتخب کریں..."
+
+#~ msgid "C_A certificate:"
+#~ msgstr "CA _سند:"
+
+#, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "نیٹ ورک منیجر"
 
@@ -4911,15 +5329,6 @@ msgstr "_نوعیت:"
 #~ msgid "Wireless network connection '%s' active"
 #~ msgstr "وائیرلیس نیٹ ورک اتصال '%s' فعال ہے"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "ثانوی DNS:"
-
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "محمد علی مکی <makkiabufaris@aol.com>\n"
-#~ "مکی کا بلاگ <http://makki.urducoder.com>\n"
-#~ "اردو کوڈر لینکس فورم <http://www.urducoder.com>"
-
 #~ msgid "_Help"
 #~ msgstr "_ہدایات"
 
@@ -4946,9 +5355,6 @@ msgstr "_نوعیت:"
 #~ msgid "Don't _warn me again"
 #~ msgstr "مجھے دوبارہ _متنبہ مت کریں"
 
-#~ msgid "No"
-#~ msgstr "نہیں"
-
 #~ msgid ""
 #~ "Open System\n"
 #~ "Shared Key"
@@ -4959,9 +5365,6 @@ msgstr "_نوعیت:"
 #~ msgid "Other Wireless Network..."
 #~ msgstr "دوسرے وائیرلیس نیٹ ورک..."
 
-#~ msgid "Yes"
-#~ msgstr "ہاں"
-
 #~ msgid "<b>Addresses</b>"
 #~ msgstr "<b>پتے</b>"
 
@@ -5088,12 +5491,6 @@ msgstr "_نوعیت:"
 #~ msgid "A_vailable to all users"
 #~ msgstr "دستیاب برائے تمام صارفین"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "_خودکار متصل ہوں"
-
-#~ msgid "_Import"
-#~ msgstr "_درآمد"
-
 #~ msgid "Error editing connection: property '%s' / '%s' invalid: %d"
 #~ msgstr "اتصال کی تدوین میں غلطی: خصوصیت '%s' / '%s' ناموزوں: %d"
 
@@ -5226,9 +5623,6 @@ msgstr "_نوعیت:"
 #~ msgid "GSM connection %d"
 #~ msgstr "GSM-Verbindung %d"
 
-#~ msgid "CDMA connection %d"
-#~ msgstr "UTMS-Verbindung %d"
-
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
 
@@ -5451,9 +5845,6 @@ msgstr "_نوعیت:"
 #~ msgid "Select the Private Key File"
 #~ msgstr "Die Datei mit dem geheimen Schlüssel auswählen"
 
-#~ msgid "Show passphrase"
-#~ msgstr "Passphrase anzeigen"
-
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "_Diesem Funknetzwerk immer vertrauen"
 
@@ -5578,9 +5969,6 @@ msgstr "_نوعیت:"
 #~ msgid "The VPN service said: \"%s\""
 #~ msgstr "Anwort des VPN-Dienstes: »%s«"
 
-#~ msgid "_Passphrase:"
-#~ msgstr "_Passwort:"
-
 #~ msgid "_ASCII Key:"
 #~ msgstr "_ASCII-Schlüssel:"
 
diff --git a/po/vi.po b/po/vi.po
index 23771f7e..591a6b62 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-11-28 15:54+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -20,95 +21,105 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "Mạng"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "Quản lý kết nối mạng"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Kết nối mạng"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "Lỗi cấu hình VPN"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "Quản lí và thay đổi thiết lập kết nối mạng"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "Tắt thông báo kết nối"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Đặt là true để tắt thông báo khi nối mạng."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "Tắt thông báo ngắt kết nối"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "Đặt là true để tắt thông báo khi ngắt mạng."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "Tắt thông báo VPN"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "Đặt là true để tắt thông báo khi ngắt mạng VPN."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "Ngăn thông báo mạng sẵn sàng"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "Đặt để tắt thông báo khi có mạng Wi-Fi."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "Tem"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Dùng để xác định thiết lập có được chuyển sang phiên bản mới không."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "Tắt tạo Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "Đặt là true để tắt tạo mạng adhock bằng applet."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "Hiện applet ở khu vực thông báo"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "Đặt thành SAI để tắt hiển thị applet trong vùng thông báo."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "Bỏ qua chứng nhận CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "Đặt nó thành đúng để tắt cảnh báo về chứng nhận CA trong xác thực EAP."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -116,130 +127,143 @@ msgstr ""
 "Đặt nó thành đúng để tắt cảnh báo về chứng nhận CA trong pha 2 của xác thực "
 "EAP."
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Quản lý mạng"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Không có kết nối mạng"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Quản lý mạng"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Xác thực 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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "Kết nố_i"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "Tê_n mạng:"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 #, fuzzy
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "Lỗi thêm/kích hoạt kết nối"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "Lỗi lạ"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "Gặp lỗi kết nối"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "Gặp lỗi khi ngắt kết nối thiết bị"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "Lỗi ngắt kết nối"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "Lỗi kích hoạt kết nối"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "Đừng nhắc nữa"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -249,7 +273,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” bị ngắt vì kết nối mạng bị ngắt."
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -259,7 +283,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì kết nối mạng bị ngắt."
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -268,7 +292,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì dịch vụ VPN dừng đột ngột."
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -278,7 +302,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì dịch vụ VPN trả về cấu hình không hợp lệ."
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -287,7 +311,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì hết hạn kết nối."
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -296,7 +320,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì dịch vụ VPN không khởi động kịp."
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -305,7 +329,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì dịch vụ VPN không khởi động được."
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -314,7 +338,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì không có khóa bí mật VPN hợp lệ."
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -323,7 +347,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì khóa bí mật VPN không hợp lệ."
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -332,7 +356,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -343,19 +367,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "Đã thiết lập thành công kết nối VPN.\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "Thông điệp đăng nhập VPN"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "Lỗi kết nối VPN"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -368,7 +392,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -381,560 +405,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "thiết bị chưa sẵn sàng (thiếu firmware)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "thiết bị chưa sẵn sàng"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "đã ngắt kết nối"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "Ngắt kết nối"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "thiết bị không được quản lý"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "Không tìm thấy thiết bị mạng dùng được"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "Kết nối _VPN"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "_Cấu hình VPN…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Kết nối _VPN"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Trình Quản lí Mạng đang không chạy…"
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "Kết nối mạng tắt"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "Bật _mạng"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "Bật _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "Bật _di động băng thông rộng"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "Bật _thông báo"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "Thông t_in kết nối"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Sửa kết nối…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "_Giới thiệu"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "Bạn đã kết nối đến mạng “%s”."
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "Đã ngắt kết nối"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "Kết nối mạng đã bị ngắt."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Đang chuẩn bị kết nối “%s”…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "Cần xác thực cho kết nối “%s”…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "Đang lấy địa chỉ mạng cho “%s”…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Kết nối “%s” đã hoạt động"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Đang bắt đầu kết nối VPN “%s”…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "Cần xác thực cho kết nối VPN “%s”…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "Đang lấy địa chỉ VPN cho “%s”…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Kết nối VPN “%s” đã hoạt động"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "Không có kết nối mạng"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "Quản lý mạng"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Sai mã PUK; vui lòng liên lạc nhà cung cấp."
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Sai mã PIN; vui lòng liên lạc nhà cung cấp."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "Đang gửi mã mở khoá…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Di động băng thông rộng (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "Di động băng thông rộng"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "Dùng được"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Kết nối băng thông rộng di động mới"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "Kết nối được thiết lập"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Bạn đã kết nối đến mạng di động băng thông rộng."
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "Mạng di động băng thông rộng."
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "Bạn đã đăng ký mạng nhà."
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "Bạn đã đăng ký mạng chuyển vùng."
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Bạn đã kết nối đến mạng di động băng thông rộng."
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Đang chuẩn bị kết nối di động băng thông rộng “%s”…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Đang cấu hình kết nối di động băng thông rộng “%s”…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "Cần xác thực cho kết nối di động băng thông rộng “%s”…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Kết nối di động băng thông rộng “%s” đã hoạt động"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet tự động"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Mạng Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Mạng Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Mạng Ethernet"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Mạng Ethernet"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Bạn đã kết nối đến mạng ethernet."
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Đang chuẩn bị kết nối mạng ethernet “%s”…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "Đang cấu hình kết nối mạng ethernet “%s”…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "Cần xác thực cho kết nối mạng ethernet “%s”…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "Đang lấy địa chỉ cho mạng ethernet “%s”…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "Kết nối mạng ethernet “%s” đã hoạt động"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Xác thực DSL"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "Kết nối đến mạng Wi-Fi ẩn"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Tạo mạng Wi-Fi mới"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(không)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "Lỗi thêm kết nối mới"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Mạng Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Mạng Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Mạng Wi-Fi"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi bị tắt"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi bị tắt từ phần cứng"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "Thêm mạng"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Mạng Wi-Fi có thể dùng"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Dùng trình đơn mạng để kết nối mạng Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "Bạn đã kết nối đến mạng Wi-Fi “%s”."
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Đang chuẩn bị kết nối mạng Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Đang cấu hình kết nối mạng Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Cần xác thực người dùng cho kết nối mạng Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "Đang lấy địa chỉ mạng Wi-Fi “%s”…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Kết nối mạng Wi-Fi “%s” đã hoạt động: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Kết nối mạng Wi-Fi “%s” đã hoạt động"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "Lỗi kích hoạt kết nối"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "Gặp lỗi khi hiển thị thông tin kết nối:"
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "WEP động"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "Địa chỉ"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Không"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (mặc định)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/giây"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Không rõ"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "Địa chỉ IP"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "Địa chỉ quảng bá"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "Mặt nạ mạng"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "_Chính:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "DNS phụ:"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "DNS thứ ba:"
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "Chung"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "Giao diện"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "Địa chỉ phần cứng"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "Trình điều khiển"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "Tốc độ"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "Bảo mật:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "Định tuyến mặc định"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "Bỏ qua"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Mật khẩu:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "Kiểu VPN"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "Cổng VPN"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "Tên người dùng VPN"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "Khẩu hiện VPN"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "Kết nối cơ sở"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Không rõ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "Không có kết nối hoạt động!"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -942,16 +991,20 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "và nhiều dịch giả, công tác viên khác"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Chương trình quản lí các thiết bị và kết nối mạng của bạn."
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "Trang web NetworkManager"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr "Nhóm Việt hóa Gnome <gnomevi-list@lists.sourceforge.net>"
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
@@ -959,33 +1012,33 @@ msgstr ""
 "NetworkManager Applet không thể tìm thấy một vài tài nguyên cần thiết (không "
 "tìm thấy tập tin .ui)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "Thiếu tài nguyên"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "Mật khẩu mạng di động băng thông rộng"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "Cần mật khẩu để kết nối “%s”."
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "Cần PIN mở khoá SIM"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "Cần PIN mở khoá SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -994,25 +1047,25 @@ msgstr ""
 "Thiết bị di động băng thông rộng “%s” cần mã PIN SIM trước khi có thể dùng."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "Mã PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "Hiện mã PIN"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "Cần PUK mở khoá SIM"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "Cần PUK mở khoá SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1021,35 +1074,42 @@ msgstr ""
 "Thiết bị di động băng thông rộng “%s” cần mã PUK SIM trước khi có thể dùng."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "Mã PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "Mã PIN mới:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "Nhập lại mã PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "Hiện mã 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "Thông tin kết nối"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "Gặp lỗi khi tạo kết nối DUN: %s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1058,56 +1118,56 @@ msgstr ""
 "Địa chỉ IP xác định máy của bạn trên mạng. Nhấn nút \"Thêm\" để thêm địa chỉ "
 "IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "_Xoá"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Bỏ qua định tuyến lấy tự động"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "Chỉ _dùng kết nối này cho tài nguyên trên mạng đó"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Nếu bật, kết nối này sẽ không bao giờ được dùng làm mặc định."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "Tạo…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "Chọn loại kết nối"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1119,85 +1179,100 @@ msgstr ""
 "Nếu bạn tạo VPN và loại kết nối VPN mong muốn không có trong danh sách, bạn "
 "có lẽ chưa cài phần bổ sung VPN cần thiết."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "_Dịch vụ:"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "Xoay vòng"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "Sao lưu chủ động"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "Quảng bá"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "Cân bằng tải truyền tải thích nghi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "Cân bằng tải thích nghi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (khuyên dùng)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "_Kết nối bond:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "_Chế độ:"
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "_Tần số theo dõi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "Tên _giao tiếp:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "Theo dõi _liên kết:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "Đí_ch ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1205,19 +1280,22 @@ msgstr ""
 "Một địa chỉ IP, hoặc một danh sách các địa chỉ IP ngăn cách nhau bằng dấu "
 "phẩy, để tìm không kiểu tra trạng thái của liên kết."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "Trễ liên kết _lên:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "Trễ liên kết _xuống:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "_Chính:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1225,105 +1303,163 @@ msgstr ""
 "Tên của giao diện thiết bị chính. Nếu được đặt thì thiết bị này sẽ luôn kích "
 "phụ thuộc hoạt mỗi khi nó sẵn sàng."
 
-#: ../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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "byte"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "_Giá đường dẫn:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "Độ ư_u tiên:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "Chế độ _Hairpin:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "_Kết nối kiểu cầu:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "T_rễ chuyển tiếp:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "Thời gian c_hào hỏi:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "Bật _mạng"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Bật _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "Tuổi _tối đa:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "Giờ t_uổi:"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "tự động"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "mặc định"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "Bật"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1334,193 +1470,234 @@ msgstr ""
 "mạng được kết nối này dùng. Tính năng này còn được biết là sao MAC hay giả "
 "MAC. Ví dụ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "_Tên giao tiếp VLAN:"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "Địa chỉ phần cứng:"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "Bất kỳ thiết bị nào"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Không thể cập nhật bí mật kết nối vì lỗi không rõ."
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "Dùng Data Center Bridging (DCB) cho kết nối này"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "Luồng điều khiển"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "Tính năng"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "Bật"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "Quảng bá"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Muốn"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "Độ ưu tiên"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "Tùy chọn…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "Nhóm ưu tiên"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "Fabric"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "Điều khiển luồng ưu tiên"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "Bật hay tắt cho ưu tiên dừng vận chuyển từng mức ưu tiên người dùng."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "Độ ưu tiên:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7:"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "Lớp giao thông:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "ăng thông hạn chế:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "Băng thông ưu tiên:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "Băng thông nhóm:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "Mã nhóm:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Nhập vào mã số nhóm ưu tiên cho từng Mức ưu tiên người dùng."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
@@ -1528,243 +1705,304 @@ msgstr ""
 "Nhập vào phần trăm băng thông kiên kết cho phép cho từng nhóm ưu tiên được "
 "dùng. Tổng cộng mọi nhóm phải là 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Nhập vào phần trăm của mức ưu tiên băng thông nhóm người dùng được dùng"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Bật hay tắt hạn chế băng thông cho từng mức ưu tiên người dùng."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "Nhập vào lớp giao thông cho từng mức ưu tiên người dùng."
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "_Tên người dùng:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "_Dịch vụ:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "_Hiện mật khẩu"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "_Mật khẩu:"
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "Giao diện"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "Giao tiếp _cha:"
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "Giao tiếp _cha:"
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "Tự động"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "Đôi xoắn (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/giây"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/giây"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/giây"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/giây"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "Bỏ qua"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "Thủ công"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "_Cổng:"
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "_Dịch vụ:"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "Địa chỉ MAC _sao:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "_Mật khẩu khoá riêng:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "Mặc định"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "Bỏ qua"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "Quảng bá"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "_Mật khẩu khoá riêng:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "_Tốc độ:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "_Hai chiều"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "Tự động kết nối đến _VPN khi sử dụng kết nối này"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "Có"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "Không"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "Mọi _người dùng được phép kết nối đến mạng này"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "_Tự động kết nối đến mạng này khi nó sẵn sàng"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "Tự động kết nối đến _VPN khi sử dụng kết nối này"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "Thông t_in kết nối"
+msgid "Firewall _zone"
+msgstr "_Vùng tường lửa:"
+
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Các kết nối _Team:"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "Kết nối _tự động"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "_Vùng tường lửa:"
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
@@ -1773,7 +2011,7 @@ msgstr ""
 "Địa chỉ IP xác định máy của bạn trên mạng. Nhấn nút \"Thêm\" để thêm địa chỉ "
 "IP."
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1781,128 +2019,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "Tự động, chỉ địa chỉ"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "Chế độ _vận chuyển:"
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Gói dữ liệu"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "Đã kết nối"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "Chế độ _vận chuyển:"
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "Tên thiết bị + số"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "_Chế độ:"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "Tự động với thiết lập DNS thủ công"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 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:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "Chia sẻ với máy khác"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "_Phương pháp:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1912,32 +2154,33 @@ msgstr ""
 "Định danh DHCP khách cho phép quản trị mạng tuỳ biến cấu hình máy tính bạn. "
 "Nếu bạn muốn dùng định danh DHCP khác, nhập ở đây."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "Miền dùng để phân giải tên máy. Dùng dấu phẩy để phân cách nhiều vùng."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "ID D_HCP khách:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "Miền _tìm kiếm:"
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "Máy chủ _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1945,11 +2188,11 @@ msgstr ""
 "Địa chỉ IP của máy chủ tên miền dùng để phân giải tên máy. Dùng dấu phẩy để "
 "phân cách địa chỉ nhiều máy chủ tên miền."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Cần gán địa chỉ IPv_4 để hoàn tất kết nối"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1957,25 +2200,35 @@ msgstr ""
 "Khi kết nối mạng IPv6, cho phép kết nối hoàn tất nếu cấu hình IPv4 thất bại "
 "nhưng IPv6 thành công."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "Đị_nh tuyến…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "Tắt"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "Bật (đưa ra địa chỉ công)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "Bật (đưa ra địa chỉ tạm thời)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "Bật"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -1985,15 +2238,20 @@ msgstr ""
 "phân cách địa chỉ nhiều máy chủ tên miền. Địa chỉ link-local sẽ tự động phạm "
 "vi đến giao diện kết nối."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "Mở rộng IPv6 _riêng:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Cần gán địa chỉ IPv_6 để hoàn tất kết nối"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2001,756 +2259,863 @@ msgstr ""
 "Khi kết nối mạng IPv4, cho phép kết nối hoàn tất nếu cấu hình IPv6 thất bại "
 "nhưng IPv4 thành công."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "Thước đo"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "_Nhập"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "_Số:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "_ID mạng:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "Thay đổi…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "Cho phép _chuyển vùng nếu mạng nhà không dùng được"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "_Hiện mật khẩu"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "Cách cho phép:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "Cấu hình _cách…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "Nén"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Dùng mã hoã điểm-đến-điểm (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "Đò_i hỏi mã hoá 128 bit"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "Dùng _stateful MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "Cho phép nén dữ liệu _BSD"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "Cho phép nén dữ liệu _Deflate"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "Dùng nén _tiêu đề TCP"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "Vang"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "Gửi gói _vang PPP"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "_Phương pháp:"
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "Không"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "Nhậ_p cấu hình kết nối kiểu team từ tập tin…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "_Phương pháp:"
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "Nâng cao"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Mạng Ethernet"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "Độ ư_u tiên:"
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "Độ ư_u tiên:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "Độ ư_u tiên:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "_Khoá riêng:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "Trễ liên kết _lên:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "Trễ liên kết _xuống:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "Giao tiếp _cha:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "Đí_ch ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "Đí_ch ARP:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "Nhậ_p cấu hình kết nối kiểu team từ tập tin…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "Cấu hình _JSON:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 #, fuzzy
 msgid "Raw Configuration"
 msgstr "Lỗi cấu hình VPN"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "Băng thông nhóm:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "Độ ưu tiên"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "Các kết nối _Team:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "Địa chỉ phần cứng:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "Địa chỉ phần cứng:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "Độ ư_u tiên:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "Năng lượng _phát:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "Năng lượng _phát:"
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "Giao tiếp _cha:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "_Tên giao tiếp VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "Địa chỉ MAC _nhân bản:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "_ID VLAN:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "Tên thiết bị + số"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + số"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "_An ninh:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "Năng lượng _phát:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/giây"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "_Tốc độ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "_Kênh:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "_Băng tần:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "Cách xác thực được phép"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol phiên bản 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2759,111 +3124,99 @@ msgstr ""
 "Trong hầu hết trường hợp, máy chủ PPP của nhà cung cấp hỗ trợ mọi cách xác "
 "thực. Nếu kết nối không thành công, thử tắt một vài cách."
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Bond"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "Team"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"Phần bổ xung VPN gặp lỗi trong việc nhập các kết nối VPN một cách chính xác\n"
-"\n"
-"Lỗi: không có kiểu dịch vụ VPN."
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "Không thể nhập kết nối VPN"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"Tập tin “%s”  không thể được đọc hoặc không chứa thông tin kết nối VPN được "
-"công nhận\n"
+"Phần bổ xung VPN gặp lỗi trong việc nhập các kết nối VPN một cách chính xác\n"
 "\n"
-"Lỗi:% s."
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "Lỗi lạ"
+"Lỗi: không có kiểu dịch vụ VPN."
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "Chọn tập tin cần nhập"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "Ảo"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "Nhập cấu hình VPN đã lưu…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2871,79 +3224,86 @@ msgstr ""
 "Hộp thoại chỉnh sửa kết nối không thể được khởi tạo do xảy ra một lỗi không "
 "rõ."
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "Không thể tạo kết nối mới"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "Lỗi xoá kết nối"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Bạn có chắc muốn xoá kết nối %s không?"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Kết nối _VPN"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "Mặt nạ mạng"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "Cổng ra"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "Thước đo"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "Tiền tố"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "Sửa %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "Sửa kết nối không tên"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "_Tên kết nối:"
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "Gặp lỗi khi khởi động trình soạn thảo"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "Lỗi thêm kết nối"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2951,246 +3311,289 @@ msgstr ""
 "Bản chỉnh kết nối không tìm được một số tài nguyên cần thiết (không tìm được "
 "tập tin .ui)"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "_Lưu"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "Lưu những thay đổi của kết nối này."
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Xác thực để lưu kết nối cho mọi người dùng trên máy này."
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "Không thể tạo kết nối"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "Không thể sửa kết nối"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "Gặp lỗi chưa biết không tạo hộp thoại sửa kết nối."
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "Gặp lỗi khi khởi động trình soạn thảo"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "Lỗi thêm kết nối"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "Đặt nó thành đúng để tắt cảnh báo về chứng nhận CA trong xác thực EAP."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "_Tên kết nối:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "_Xuất…"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "không bao giờ"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "bây giờ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d phút trước"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d giờ trước"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ngày trước"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d tháng trước"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d năm trước"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Lỗi thêm kết nối"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Kết nối team %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Kết nối team %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "Tên"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "Dùng lần cuối"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "Sửa kết nối đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "Xác thực để sửa kết nối đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "Xoá kết nối đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "Xác thực để xóa kết nối VPN đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Loại kết nối di động băng thông rộng không hỗ trợ."
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "Không biết cách tạo kết nối “%s”"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Lỗi sửa kết nối"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "Gặp lỗi tạo kết nối"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "Lỗi thêm kết nối"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "Chưa cài đặt phần bổ sung VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "Không biết cách tạo kết nối “%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "Lỗi sửa kết nối"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "Không tìm thấy kết nối với UUID “%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Kết nối mạng"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Kết nối _VPN"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "An ninh 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "Không thể nạp giao diện an ninh 802.1X."
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "Dùng an ninh 802.1_X cho kết nối này"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "Không thể tải giao diện Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "không thể tìm thiết bị Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Kết nối bond %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "Mạng Ethernet"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Mạng Wi-Fi"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "Không thể nạp giao diện bond."
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "_Chính:"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "Kết nối bond %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "Không thể nạp giao diện cầu."
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Kết nối bridge %d"
@@ -3198,32 +3601,37 @@ msgstr "Kết nối bridge %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "Cổng bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "Không thể nạp giao diện cổng cầu."
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "Không thể tải giao diện người dùng DCB."
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "Không thể nạp giao diện DSL."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "Giao tiếp _cha:"
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "Kết nối DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3233,44 +3641,43 @@ msgstr ""
 "Tuỳ chọn này khoá kết nối này vào thiết bị xác định bởi địa chỉ MAC nhập ở "
 "đây. Ví dụ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "Bỏ qua"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "Không thể nạp giao diện ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "Địa chỉ MAC _sao:"
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Kết nối Ethernet %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3280,11 +3687,11 @@ msgstr ""
 "nó có tác quả của tập hợp vùng trong tường lửa. Chỉ hữu ích khi tường lửa "
 "được kích hoạt."
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "Không thể nạp giao diện chung."
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3295,158 +3702,162 @@ msgstr ""
 "Tuỳ chọn này khoá kết nối này vào thiết bị xác định bởi địa chỉ MAC nhập ở "
 "đây. Ví dụ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "Không thể nạp giao diện InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Kết nối InfiniBand %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "Không thể nạp giao diện người dùng IPv4."
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Kết nối Ethernet %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "Tự động (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "Tự động (VPN) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "Tự động, chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "Tự động (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Tự động (PPPoE) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "Tự động (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "Tự động (DHCP) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "Chỉ Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "Máy chủ _DNS bổ sung:"
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "Miền _tìm kiếm bổ sung:"
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Sửa định tuyến IPv4 cho %s"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "Thiết lập IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "Không thể nạp giao diện người dùng IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "Tự động, chỉ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Sửa định tuyến IPv6 cho %s"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "Thiết lập IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "Không thể nạp giao diện người dùng IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "Không thể nạp giao diện WiMAX"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Kết nối WiMAX %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "Nhân đôi phần phụ thuộc"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "Cả hai phần phụ thuộc “%s” và “%s” áp dụng cho thiết bị “%s”"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
@@ -3455,25 +3866,25 @@ msgstr ""
 "Cả hai phần phụ thuộc “%s” và “%s” áp dụng cho các cổng ảo khác nhau (“%s” "
 "và “%s”) của cùng một thiết bị vật lý."
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s phụ thuộc %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "Không thể nạp giao diện mạng di động băng thông rộng."
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "Loại kết nối di động băng thông rộng không hỗ trợ."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Chọn kiểu nhà cung cấp di động băng thông rộng"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
@@ -3482,90 +3893,86 @@ msgstr ""
 "Chọn công nghệ di động băng thông rộng của nhà cung cấp của bạn. Hỏi nhà "
 "cung cấp của mình nếu bạn không chắc."
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Dùng công nghệ dựa trên _GSM (v.d. GPRS, EDGS, UTMS, HSDPA)"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Dùng công nghệ dựa trên C_DMA (v.d. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "không có"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Sửa cách xác thực PPP cho %s"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "Thiết lập PPP"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "Không thể nạp giao diện PPP."
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "Không thể nạp giao diện bond."
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "Lỗi: tập tin không chứa cấu hình dạng JSON đúng"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "Không thể tải giao diện người dùng team."
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "Kết nối team %d"
@@ -3573,69 +3980,69 @@ msgstr "Kết nối team %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "Cổng Team"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 msgstr "Không thể tải giao diện cổng team."
 
 #. 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (thông qua \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Không có kết nối mạng"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "Không thể nạp giao diện vlan."
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Kết nối VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "Không thể nạp giao diện VPN."
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "Không thể tìm dịch vụ phần mở rộng VPN cho “%s”."
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "Không thể tìm dịch vụ phần mở rộng VPN cho “%s”."
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "Gặp lỗi kết nối"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "Không thể nạp giao diện VPN."
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "Không thể tìm dịch vụ phần mở rộng VPN cho “%s”."
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "Kết nối VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "Chọn loại kết nối VPN"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3645,7 +4052,7 @@ msgstr ""
 "Chọn loại VPN bạn muốn tạo kết nối mới. Nếu loại VPN này không có trong danh "
 "sách, bạn có lẽ chưa cài phần bổ sung VPN cần thiết."
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3654,7 +4061,7 @@ msgstr ""
 "Tuỳ chọn này khoá kết nối này vào điểm truy cập Wi-Fi (AP) xác định bởi "
 "BSSID nhập ở đây. Ví dụ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3664,96 +4071,94 @@ msgstr ""
 "Tuỳ chọn này khoá kết nối này vào thiết bị xác định bởi địa chỉ MAC nhập ở "
 "đây. Ví dụ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "Không thể nạp giao diện Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "Bất kỳ thiết bị nào"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Kết nối Wi-Fi %d"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Khoá WEP 40/128-bit (Thập lục phân hoặc ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Mật khẩu WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "WEP động (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Cá nhân"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kinh doanh"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Không thể nạp giao diện an ninh Wi-Fi; bỏ qua thiết lập Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "An ninh Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Không thể nạp giao diện an ninh Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "Tập tin \"%s\" đã có."
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Bạn có muốn thay %s với kết nối VPN bạn đang lưu không?"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "Không thể xuất kết nối VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3764,222 +4169,106 @@ msgstr ""
 "\n"
 "Lỗi: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Xuất kết nối VPN…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "_Bỏ khoá"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "Tự động gỡ khoá thiết bị này"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "Thông tin kết nối"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "Kết nối mạng hoạt động"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "Chọn chứng nhận CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "_Khoá riêng:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "_Mật khẩu khoá riêng:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "Chọn chứng nhận CA"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "Chứng nhận người _dùng:"
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "Kết nối di động băng thông rộng của bạn được cấu hình như sau:"
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "Thiết bị của bạn:"
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "Nhà cung cấp của bạn:"
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "Gói cước của bạn:"
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"Kết nối có bây giờ sẽ được thực hiện cho nhà cung cấp băng thông rộng di "
-"động của bạn bằng cách sử dụng các cài đặt đã chọn. Nếu kết nối không thành "
-"công hay bạn không thể truy cập tài nguyên mạng, kiểm tra các cài đặt của "
-"bạn. Để sửa đổi cài đặt kết nối băng thông rộng di động của bạn, chọn \"Kết "
-"nối mạng\" từ trình đơn Hệ Thống>Tuỳ Thích."
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "Xác nhận thiết lập di động băng thông rộng"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "Không thấy có quốc gia của tôi"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Không liệt kê"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "_Chọn gói cước"
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "_APN (Access Point Name - Tên điểm truy cập) của _gói cước được chọn"
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"Cảnh báo: Chọn một kế hoạch không đúng có thể dẫn đến các vấn đề thanh toán "
-"cho tài khoản băng thông rộng của bạn hoặc có thể ngăn chặn kết nối.\n"
-"\n"
-"Nếu bạn không chắc về kế hoạch của bạn hãy hỏi nhà cung cấp của bạn cho APN "
-"kế hoạch của bạn."
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "Chọn gói cước của bạn"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "Không thấy gói cước của tôi…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "Chọn nhà cung cấp từ _danh sách:"
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Nhà cung cấp"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "Nhà cung cấp:"
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "Nhà cung cấp của tôi dùng công nghệ GSM (GPRS, EDGE, UMTS, HSPA)"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "Nhà cung cấp của tôi dùng công nghệ CDMA (1xRTT, EVDO)"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "Chọn nhà cung cấp của bạn"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "Danh sách quốc gia hoặc lãnh thổ:"
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "Quốc gia hoặc lãnh thổ"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "Không thấy có quốc gia của tôi"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "Chọn quốc gia hoặc lãnh thổ của nhà cung cấp"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Thiết bị GSM đã cài đặt"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Thiết bị CDMA đã cài đặt"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "Bất kỳ thiết bị nào"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "Kết nối băng thông rộng di động mới"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -3987,257 +4276,356 @@ msgstr ""
 "Trợ lý này giúp bạn dễ dàng cài đặt một kết nối băng thông rộng di động vào "
 "một mạng (3G) di động."
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Bạn sẽ cần những thông tin sau:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "Tên nhà cung cấp"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Tên gói cước"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(trong vài trường hợp) APN (Access Point Name) của gói cước"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Tạo kết nối đến thiết bị di động băng thông rộng _này:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "Bất kỳ thiết bị nào"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Thiết lập kết nối băng thông rộng di động"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "Kết nối băng thông rộng di động mới"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "Quốc gia hoặc lãnh thổ"
+
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "Chọn quốc gia hoặc lãnh thổ của nhà cung cấp"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "Chọn nhà cung cấp từ _danh sách:"
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "Nhà cung cấp của tôi dùng công nghệ GSM (GPRS, EDGE, UMTS, HSPA)"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "Nhà cung cấp của tôi dùng công nghệ CDMA (1xRTT, EVDO)"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "Chọn nhà cung cấp của bạn"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "_Chọn gói cước"
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "_APN (Access Point Name - Tên điểm truy cập) của _gói cước được chọn"
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"Cảnh báo: Chọn một kế hoạch không đúng có thể dẫn đến các vấn đề thanh toán "
+"cho tài khoản băng thông rộng của bạn hoặc có thể ngăn chặn kết nối.\n"
+"\n"
+"Nếu bạn không chắc về kế hoạch của bạn hãy hỏi nhà cung cấp của bạn cho APN "
+"kế hoạch của bạn."
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "Chọn gói cước của bạn"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "Kết nối di động băng thông rộng của bạn được cấu hình như sau:"
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "Thiết bị của bạn:"
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "Nhà cung cấp của bạn:"
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "Gói cước của bạn:"
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"Kết nối có bây giờ sẽ được thực hiện cho nhà cung cấp băng thông rộng di "
+"động của bạn bằng cách sử dụng các cài đặt đã chọn. Nếu kết nối không thành "
+"công hay bạn không thể truy cập tài nguyên mạng, kiểm tra các cài đặt của "
+"bạn. Để sửa đổi cài đặt kết nối băng thông rộng di động của bạn, chọn \"Kết "
+"nối mạng\" từ trình đơn Hệ Thống>Tuỳ Thích."
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Xác nhận thiết lập di động băng thông rộng"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(không)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "_Chứng nhận CA:"
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Không rõ"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "Chọn chứng nhận CA"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "Chứng nhận người _dùng:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "Lỗi sửa kết nối"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "_Bỏ khoá"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "Chỉ lưu mật khẩu cho tài _khoản này"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "Lưu mật khẩu cho _tất cả các tài khoản"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "_Hỏi mật khẩu mỗi lần"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "Cần mật khẩu để kết nối “%s”."
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "Mật khẩu _phụ:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "_Hiện mật khẩu"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "Mật khẩu _phụ:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "_Hiện mật khẩu"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Mật khẩu _phụ:"
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "_Mật khẩu:"
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "Ngắt kết nối"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Không"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "WEP động (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "_Tạo"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "Cần mật khẩu hoặc khoá mã hoá để truy cập mạng Wi-Fi “%s”."
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "Tạo mạng Wi-Fi mới"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "Mạng Wi-Fi mới"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Nhập tên mạng Wi-Fi bạn muốn tạo."
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kết nối đến mạng Wi-Fi ẩn"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "Mạng Wi-Fi ẩn"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Nhập tên và chi tiết an ninh của mạng Wi-Fi ẩn bạn muốn kết nối."
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "_An ninh Wi-Fi:"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "_Kết nối:"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "_Bộ điều hợp Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "Nhà cung cấp:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "Danh sách quốc gia hoặc lãnh thổ:"
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "Quốc gia hoặc lãnh thổ"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Dây"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4247,17 +4635,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%2$s %1$s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "_An ninh Wi-Fi:"
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "Tê_n mạng:"
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "_Kết nối:"
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "_Bộ điều hợp Wi-Fi:"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "Cách dùng:"
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4265,7 +4675,7 @@ msgstr ""
 "Chương trình này là một phần của NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -4273,412 +4683,482 @@ msgstr ""
 "Chương trình này không được thiết kế để dùng dạng dòng lệnh, mà chạy từ môi "
 "trường GNOME."
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "chưa bật"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "chưa đăng ký"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Mạng nhà (%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "Mạng nhà"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "đang tìm"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "đăng ký bị từ chối"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (chuyển vùng %s)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (chuyển vùng)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mạng chuyển vùng (%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "Mạng chuyển vùng"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "Mã PIN cho SIM card “%s” trên “%s”"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "Cần mã PIN"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cần mã PIN cho thiết bị di động băng thông rộng"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Kết nối di động băng thông rộng “%s” đã hoạt động: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "chuyển vùng"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "Kết nối %s"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "Chứng nhậng DER hoặc PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Khoá riêng DER, PEM, hoặc PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "Chọn tập tin PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "Mọi tập tin"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "Vô danh"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "Xác thực"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "Cả hai"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "Định danh _vô danh:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "Tập tin _PAC:"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "Xác thực _trong:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Cho phép tự động dự liệ_u PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "Chọn chứng nhận CA (Certificate Authority)…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "Phiên bản 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "Phiên bản 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "_Chứng nhận CA:"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "Phiên bản _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Mật khẩu WEP 128-bit"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "_Hiện mật khẩu"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "Không có chứng nhận CA như _yêu cầu"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "Không có chứng nhận CA như _yêu cầu"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "Đị_nh danh:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "Đường hầm TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Bảo vệ (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "_Xác thực:"
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Mặc định)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "Hệ thống mở"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "Khóa dùng chung"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (Mặc định)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "_Khóa:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "_Hiện khoá"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "_Chỉ mục WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "_Kiểu:"
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (mặc định)"
+
+#~ msgid "Ignored"
+#~ msgstr "Bỏ qua"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "Không thể cập nhật bí mật kết nối vì lỗi không rõ."
+
+#~ msgid "Priority:"
+#~ msgstr "Độ ưu tiên:"
+
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "_Tự động kết nối đến mạng này khi nó sẵn sàng"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "Thông t_in kết nối"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "Không thể nhập kết nối VPN"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "Tập tin “%s”  không thể được đọc hoặc không chứa thông tin kết nối VPN "
+#~ "được công nhận\n"
+#~ "\n"
+#~ "Lỗi:% s."
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "Lỗi lạ"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "Kết nối mạng hoạt động"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "Chọn chứng nhận CA (Certificate Authority)…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "_Chứng nhận CA:"
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "Quản lý mạng"
@@ -4712,30 +5192,6 @@ msgstr "_Kiểu:"
 #~ 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"
 
@@ -4965,12 +5421,6 @@ msgstr "_Kiểu:"
 #~ msgid "The property '%s' / '%s' is invalid: %d"
 #~ msgstr "Thuộc tính “%s” / “%s” không hợp lệ: %d"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "Không thể nạp giao diện WiMAX"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "Kết nối WiMAX %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4991,9 +5441,6 @@ msgstr "_Kiểu:"
 #~ msgid "Error: %s"
 #~ msgstr "Lỗi: %s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "Gặp lỗi khi tạo kết nối DUN: %s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "Điện thoại bạn đã có thể dùng!"
 
@@ -5031,12 +5478,6 @@ msgstr "_Kiểu:"
 #~ msgid "%s Network"
 #~ msgstr "Mạng %s"
 
-#~ msgid "Secondary DNS:"
-#~ msgstr "DNS phụ:"
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "DNS thứ ba:"
-
 #~ msgid "_Save..."
 #~ msgstr "_Lưu…"
 
@@ -5061,12 +5502,6 @@ msgstr "_Kiểu:"
 #~ msgid "ModemManager is not running"
 #~ msgstr "ModemManager chưa chạy"
 
-#~ msgid "No"
-#~ msgstr "Không"
-
-#~ msgid "Yes"
-#~ msgstr "Có"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Mạng không dây (%s)"
 
@@ -5104,12 +5539,6 @@ msgstr "_Kiểu:"
 #~ msgid "Wireless connection %d"
 #~ msgstr "Kết nối không dây %d"
 
-#~ msgid "_Import"
-#~ msgstr "_Nhập"
-
-#~ msgid "Connect _automatically"
-#~ msgstr "Kết nối _tự động"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "Mọi người đều dùng được"
 
@@ -5153,9 +5582,6 @@ msgstr "_Kiểu:"
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "Mạng nội bộ không dây (%s)"
 
-#~ msgid "translator-credits"
-#~ msgstr "Nhóm Việt hóa Gnome <gnomevi-list@lists.sourceforge.net>"
-
 #~ msgid ""
 #~ "Copyright © 2004-2005 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
diff --git a/po/wa.po b/po/wa.po
index 4174a14c..8c956857 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2004-09-09 10:41+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -17,225 +18,246 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 #, fuzzy
 msgid "Network"
 msgstr "Rantoeles sins fyis"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 #, fuzzy
 msgid "Manage your network connections"
 msgstr "Raloyaedjes rantoele"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
 msgstr "Raloyaedjes rantoele"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "Raloyaedjes rantoele"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr ""
 
-#: ../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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr ""
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
-msgid "_Network name:"
+msgid "_Network name"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr ""
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr ""
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr ""
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr ""
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr ""
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr ""
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +265,7 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -251,14 +273,14 @@ msgid ""
 "interrupted."
 msgstr ""
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service stopped unexpectedly."
 msgstr ""
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -266,49 +288,49 @@ msgid ""
 "configuration."
 msgstr ""
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the connection attempt timed out."
 msgstr ""
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service did not start in time."
 msgstr ""
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because the VPN service failed to start."
 msgstr ""
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because there were no valid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed because of invalid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
 "The VPN connection “%s” failed."
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -316,20 +338,20 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr ""
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 #, fuzzy
 msgid "VPN Connection Failed"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +360,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -347,582 +369,607 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr ""
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr ""
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr ""
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr ""
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr ""
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr ""
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 #, fuzzy
 msgid "_VPN Connections"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr ""
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr ""
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 #, fuzzy
 msgid "Enable _Networking"
 msgstr "Rantoeles sins fyis"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr ""
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr ""
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr ""
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr ""
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 #, fuzzy
 msgid "_About"
 msgstr "Å_d fwait..."
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr ""
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr ""
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 #, fuzzy
 msgid "The network connection has been disconnected."
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr ""
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 #, fuzzy
 msgid "No network connection"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 #, fuzzy
 msgid "NetworkManager Applet"
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr ""
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr ""
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr ""
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr ""
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr ""
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr ""
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, fuzzy, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, fuzzy, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 #, fuzzy
 msgid "Ethernet Networks"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 #, fuzzy
 msgid "Ethernet Network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr ""
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr ""
+
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, fuzzy, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, fuzzy, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 #, fuzzy
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 #, fuzzy
 msgid "More networks"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr ""
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr ""
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr ""
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr ""
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr ""
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr ""
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr ""
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr ""
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+msgid "Primary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Secondary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr ""
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr ""
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr ""
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr ""
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr ""
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr ""
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+msgid "Security"
 msgstr ""
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr ""
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr ""
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "Sicret:"
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr ""
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr ""
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr ""
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr ""
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 #, fuzzy
 msgid "Base Connection"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr ""
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
@@ -931,34 +978,34 @@ msgstr ""
 "L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
 "rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 #, fuzzy
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -966,25 +1013,25 @@ msgid ""
 msgstr ""
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr ""
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr ""
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -992,89 +1039,95 @@ msgid ""
 msgstr ""
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr ""
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr ""
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr ""
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
+#: src/applet-vpn-request.c:408
+msgid "Connection had no VPN setting"
+msgstr ""
+
+#: src/applet-vpn-request.c:458
+#, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr ""
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1082,634 +1135,778 @@ msgid ""
 "not appear in the list, you may not have the correct VPN plugin installed."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+msgid "_Device"
+msgstr ""
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
-msgid "Bonded _connections:"
+msgid "Bonded _connections"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+msgid "M_ode"
 msgstr ""
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+msgid "Monitoring _frequency"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr ""
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+msgid "_Interface name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+msgid "_Link Monitoring"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+msgid "ARP _targets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+msgid "Link _up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+msgid "Link _down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+msgid "_Primary"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+msgid "_MTU"
 msgstr ""
 
-#: ../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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+msgid "Path _cost"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+msgid "_Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+msgid "_Hairpin mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
-msgid "Bridged _connections:"
+msgid "Bridged _connections"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+msgid "_Forward delay"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:232
+msgid "_Hello time"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:378
+msgid "_Max age"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+msgid "_Aging time"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr ""
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:1069
+msgid "Traffic Class"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+msgid "Strict Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+msgid "Priority Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+msgid "Group Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+msgid "Group ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:59
+msgid "_Service"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
 msgstr ""
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
+msgstr "Sicret:"
+
+#: src/connection-editor/ce-page-dsl.ui:116
+msgid "PPP _interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:130
+msgid "P_arent interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+msgid "C_laim interface"
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+msgid "_Port"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
+msgid "C_loned MAC address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+#: src/connection-editor/ce-page-ethernet.ui:242
+msgid "Wake on LAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
-msgid "_Wake on LAN password:"
+#: src/connection-editor/ce-page-ethernet.ui:388
+msgid "_Wake on LAN password"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+msgid "_Speed"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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 "Duple_x:"
+#: src/connection-editor/ce-page-ethernet.ui:482
+msgid "Duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
+#: src/connection-editor/ce-page-general.ui:80
+msgid "Automatically connect to _VPN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Connection _priority for auto-activation:"
+#: src/connection-editor/ce-page-general.ui:96
+msgid "Firewall _zone"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+msgid "Connect _automatically with priority"
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:167
 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 ""
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 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 ""
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1717,1109 +1914,1211 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr ""
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+msgid "_Transport mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 msgid "Device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 msgid "Parent device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 msgid "MTU"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+msgid "_Method"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 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."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+msgid "D_HCP client ID"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+msgid "S_earch domains"
 msgstr ""
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+msgid "DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+msgid "Stable privacy"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
 "be automatically scoped to the connecting interface."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+msgid "IPv6 _privacy extensions"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+msgid "Strict"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+msgid "SCI port"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+msgid "Nu_mber"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+msgid "_APN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
-msgstr ""
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
+msgstr "Rantoeles sins fyis"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+msgid "P_IN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+msgid "Allowed methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-msgid "Method:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+msgid "Method"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-msgid "_Port priority:"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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."
+#: src/connection-editor/ce-page-team-port.ui:271
+msgid "_Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
-msgid "_LACP port priority:"
+#: src/connection-editor/ce-page-team-port.ui:332
+msgid "_LACP port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
-msgid "LACP port _key:"
+#: src/connection-editor/ce-page-team-port.ui:346
+msgid "LACP port _key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
-msgid "_Up delay:"
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
+msgid "_Up delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
-msgid "_Down delay:"
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
+msgid "_Down delay"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
-msgid "Send _interval:"
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
+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:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:"
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
+msgid "_Source host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
-msgid "_Target host:"
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
+msgid "_Target host"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
-msgid "Edit _JSON configuration:"
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
+msgid "Edit _JSON configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
-msgid "_Teamed connections:"
+msgid "_Teamed connections"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
-msgid "_Hardware Address:"
+#: src/connection-editor/ce-page-team.ui:739
+msgid "_Hardware Address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
-msgid "_Hardware address policy:"
+#: src/connection-editor/ce-page-team.ui:813
+msgid "_Hardware address policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "_System priority:"
+#: src/connection-editor/ce-page-team.ui:903
+msgid "_System priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 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 _balancing interval:"
+#: src/connection-editor/ce-page-team.ui:1085
+msgid "Transmission _balancing interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
-msgid "_Transmission balancer:"
+#: src/connection-editor/ce-page-team.ui:1100
+msgid "_Transmission balancer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+msgid "_Parent interface"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN inter_face name:"
+#: src/connection-editor/ce-page-vlan.ui:41
+msgid "VLAN inter_face name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "Cloned MAC _address:"
+#: src/connection-editor/ce-page-vlan.ui:55
+msgid "Cloned MAC _address"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+msgid "VLAN _id"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+msgid "S_ecurity"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+msgid "Transmission po_wer"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+msgid "_Rate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+msgid "_BSSID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+msgid "C_hannel"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+msgid "Ban_d"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+msgid "SS_ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
-msgid "VPN"
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:209
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:220
-msgid "unknown error"
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
+msgid "Select file to import"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
-msgid "Select file to import"
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr ""
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 #, fuzzy
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
@@ -2828,248 +3127,290 @@ msgstr ""
 "L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
 "rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
-msgstr ""
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
+msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "Å_d fwait..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+msgid "Connection type not specified."
+msgstr ""
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "S' _elodjî sol rantoele"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
@@ -3077,84 +3418,87 @@ msgstr ""
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+msgid "missing parent interface"
+msgstr ""
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr ""
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
 "firewall. Only usable if firewalld is active."
 msgstr ""
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3162,269 +3506,266 @@ msgid ""
 "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+msgid "Additional DNS ser_vers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+msgid "Additional s_earch domains"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+msgid "Could not load MACsec user interface."
+msgstr ""
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "Raloyaedjes rantoele"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr ""
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr ""
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr ""
@@ -3432,175 +3773,173 @@ msgstr ""
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
+#: src/connection-editor/page-vpn.c:64
+#, c-format
+msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:113
-#, c-format
-msgid "Could not find VPN plugin for “%s”."
+#: src/connection-editor/page-vpn.c:65
+msgid "unknown failure"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:122
-#, c-format
-msgid "Could not load editor VPN plugin for “%s” (%s)."
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:123
-msgid "unknown failure"
+#: src/connection-editor/page-vpn.c:117
+#, c-format
+msgid "Could not find VPN plugin for “%s”."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:199
 #, fuzzy, c-format
 msgid "VPN connection %d"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 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."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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)”"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 #, fuzzy
 msgid "WEP 128-bit Passphrase"
 msgstr "Sicret:"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3608,456 +3947,434 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr ""
 
-#: ../src/info.ui.h:3
-#, fuzzy
-msgid "Active Network Connections"
-msgstr "Raloyaedjes rantoele"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
+
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "Sicret:"
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr ""
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
 msgstr ""
 
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
+msgid "My plan is not listed…"
 msgstr ""
 
-#: ../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."
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
+msgid "Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
+msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
-msgid "Unlisted"
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
+msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr ""
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Raloyaedjes rantoele"
 
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 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."
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
-msgid "My plan is not listed…"
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider’s name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
-msgid "Provider"
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
+msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 
-#: ../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:"
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
+msgid "Create a connection for _this mobile broadband device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
+msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+#: src/libnma/nma-mobile-wizard.ui:189
+msgid "Country or region:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+msgid "Choose your Provider’s Country or Region"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
+#: src/libnma/nma-mobile-wizard.ui:289
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-msgid "Choose your Provider’s Country or Region"
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
-msgid "Installed GSM device"
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
-msgid "Installed CDMA device"
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"This assistant helps you easily set up a mobile broadband connection to a "
-"cellular (3G) network."
+"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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
-msgid "You will need the following information:"
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
-msgid "Your broadband provider’s name"
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
-msgid "Your broadband billing plan name"
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
-msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
-msgid "Create a connection for _this mobile broadband device:"
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
+#: src/libnma/nma-mobile-wizard.ui:576 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."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
-msgid "Set up a Mobile Broadband Connection"
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-#, fuzzy
-msgid "New Mobile Broadband Connection"
-msgstr "Raloyaedjes rantoele"
-
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
-#, c-format
-msgid "%s certificate _password:"
-msgstr ""
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
+#, fuzzy, c-format
+msgid "%s certificate _password"
+msgstr "Sicret:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
-msgid "Click to connect"
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
+msgid "Click to connect"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 #, fuzzy
 msgid "Wi-Fi Network Authentication Required"
 msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy
 msgid "New Wi-Fi network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
-msgstr ""
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
+msgstr "Rantoeles sins fyis"
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
-msgid "C_onnection:"
+msgid "C_onnection"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
-msgid "Wi-Fi _adapter:"
+msgid "Wi-Fi _adapter"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr ""
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr ""
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr ""
 
@@ -4067,426 +4384,439 @@ msgstr ""
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr ""
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:129
+#, fuzzy
+msgid "_Network name:"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnm-gtk/wifi.ui:154
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Raloyaedjes rantoele"
+
+#: src/libnm-gtk/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Rantoeles sins fyis"
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr ""
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr ""
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr ""
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, fuzzy, c-format
 msgid "Home network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/mb-menu-item.c:143
-#, fuzzy, c-format
+#: src/mb-menu-item.c:143
+#, fuzzy
 msgid "Home network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr ""
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/mb-menu-item.c:172
-#, fuzzy, c-format
+#: src/mb-menu-item.c:172
+#, fuzzy
 msgid "Roaming network"
 msgstr "S' _elodjî sol rantoele"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr ""
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr ""
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr ""
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, fuzzy, c-format
 msgid "%s connection"
 msgstr "Raloyaedjes rantoele"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
+#: src/wireless-security/eap-method.c:365
+msgid "no CA certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+msgid "Anony_mous identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+msgid "PAC _file"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+msgid "_Inner authentication"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
+msgid "MD5"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+#: src/wireless-security/eap-method-peap.ui:26
+msgid "Version 0"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
-msgid "MD5"
+#: src/wireless-security/eap-method-peap.ui:29
+msgid "Version 1"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-msgid "Choose a Certificate Authority certificate"
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-msgid "Version 0"
+#: src/wireless-security/eap-method-peap.ui:89
+msgid "PEAP _version"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
-msgid "Version 1"
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "No CA certificate is _required"
+#: src/wireless-security/eap-method-simple.c:90
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-simple.c:106
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:75
-msgid "missing EAP username"
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
-msgid "missing EAP password"
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "Sicret:"
+
+#: src/wireless-security/eap-method-simple.ui:128
+msgid "Sh_ow passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
-msgid "no CA certificate selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
+#: src/wireless-security/eap-method-tls.ui:20
+msgid "I_dentity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+msgid "Au_thentication"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr ""
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr ""
+
+#: src/wireless-security/ws-wep-key.ui:54
+msgid "_Key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+msgid "WEP inde_x"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+msgid "_Type"
 msgstr ""
 
 #, fuzzy
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7b14733e..3cbda3ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,12 +16,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2017-11-07 06:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_Hans\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,233 +30,242 @@ msgstr ""
 "X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n"
 "X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "网络"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "管理网络连接"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "活动的网络连接"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "管理或更改您的网络连接设置"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "禁用连接通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "将此项设为 true 以禁用连接到一个网络时显示的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "禁用断开通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "将此项设为 true 以禁用从一个网络断开时显示的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "禁用 VPN 通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "将此项设为 true 以禁用连接或断开 VPN 时的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "禁用网络可用通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "将此项设为 true 以禁用无线网络可用时显示的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "时间戳"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "用于决定设置是否应被迁移至一个新版本。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "禁用 Wi-Fi 建立"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "设为 true 以禁止使用小程序时创建 adhoc 网络。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "在通知区域显示小程序图标"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "设为 FALSE 以禁止小程序图标在通知区域显示。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "忽略 CA 证书"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "将此项设为 true 以禁用在 EAP 认证中关于 CA 证书的警告。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "将此项设为 true 以禁用在 EAP 认证第 2 阶段中关于 CA 证书的警告。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "网络管理器"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 msgid "NetworkManager connection editor"
 msgstr "NetworkManager 连接编辑器"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr "NetworkManager 是管理和配置网络连接和设备的系统服务。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr "nm-connection-editor 程序为网络管理器创建或编辑现有的连接配置文件。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager Developers"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "对象类 '%s' 没有名为 '%s' 的属性"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "对象类 '%s' 的 '%s' 属性是不可写的"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "对象 '%s' 的构造属性 \"%s\" 在构造后不能被设置"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "'%s::%s' 不是有效的属性名，'%s' 不是 GObject 子类型。"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "无法从类型 '%s' 的值设置类型为 '%s' 的属性 '%s'"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr "类型 '%s' 的值 \"%s\" 是无效的或超出类型为 '%s' 的属性 '%s' 的范围"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 认证"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "取消（_C）"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "网络名称(_N)："
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "安全。"
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "无法添加/启用连接"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "设备断开失败"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "断开失败"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "连接启用失败"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 msgid "Don’t show this message again"
 msgstr "不再显示此信息"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, c-format
 msgid ""
 "\n"
@@ -265,7 +275,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开，因为网络连接被中断。"
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +285,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为网络连接被中断。"
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +294,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为 VPN 服务异常中断。"
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, c-format
 msgid ""
 "\n"
@@ -294,7 +304,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为 VPN 服务返回了一个非法配置。"
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +313,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为连接超时。"
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, c-format
 msgid ""
 "\n"
@@ -312,7 +322,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为VPN 服务未在所需时间内启动。"
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +331,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为 VPN 服务启动失败。"
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +340,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为没有合法的 VPN secret。"
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +349,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败，因为 VPN secret 非法。"
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +358,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。"
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -359,19 +369,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "已成功建立 VPN 连接。\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN 连接失败"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -384,7 +394,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, c-format
 msgid ""
 "\n"
@@ -397,561 +407,572 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "设备未就绪(缺少固件)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "设备未就绪"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "断开"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "设备未托管"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "没有可用的网络设备"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 msgid "_Configure VPN…"
 msgstr "配置 VPN(_C)..."
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 msgid "_Add a VPN connection…"
 msgstr "添加一个 VPN 连接(_A)..."
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager 没有运行…"
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "启用联网(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "启用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "启用移动宽带(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "启用通知(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 msgid "Edit Connections…"
 msgstr "编辑连接..."
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, c-format
 msgid "You are now connected to “%s”."
 msgstr "您现在已连接到“%s”。"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "网络连接已断开。"
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "正在准备网络连接“%s”..."
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "网络连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "正在为“%s”请求一个网络地址..."
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, c-format
 msgid "Network connection “%s” active"
 msgstr "网络连接“%s”处于活动状态"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "正在启动 VPN 连接“%s”..."
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "正在为“%s”请求一个 VPN 地址..."
 
-#: ../src/applet.c:2642
-#, c-format
+#: src/applet.c:2640
 msgid "VPN connection active"
 msgstr "VPN 连接处于活动状态"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "错误的 PUK 代码；请联络您的供应商。"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "错误的 PIN 代码；请联络您的供应商。"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 msgid "Sending unlock code…"
 msgstr "正在发送解锁码..."
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "移动宽带(%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "可用的"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 msgid "New Mobile Broadband connection…"
 msgstr "新移动宽带连接..."
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "连接已建立"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "移动宽带网络。"
 
 # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "您现在已注册到主网络。"
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "您现在已注册到一个漫游网络。"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "正在准备移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "正在配置移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "移动宽带连接“%s”需要用户认证..."
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "移动宽带连接“%s”已处于活动状态"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自动以太网"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "以太网"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "以太网"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "您现已连接到以太网。"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "正在准备以太网连接 %s..."
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "正在配置以太网连接 %s..."
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "以太网连接 %s 需要用户认证..."
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "正在为 %s 请求一个以太网地址..."
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "以太网连接 %s 处于活跃状态"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "连接到隐藏的 Wi-Fi 网络(_C)"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 msgid "Create _New Wi-Fi Network…"
 msgstr "创建新的 Wi-Fi 网络(_N)"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(无)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "无法添加新连接"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "权限不足。"
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已禁用"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已通过硬件开关禁用"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi 网络可用"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用网络菜单连接到 Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "您现在已连接到 Wi-Fi 网络 %s。"
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "正在准备 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "正在配置 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi 网络 %s 需要用户认证..."
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "正在为 %s 请求一个网络地址..."
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi 网络连接 %s 处于活动状态：%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi 网络连接 %s 处于活动状态"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "无法启用连接"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "显示连接信息时出错："
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "动态 WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 msgid "More addresses"
 msgstr "更多地址"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (默认)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "未知"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "广播地址"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "子网掩码"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "主要(_P)："
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "次要密码(_S)："
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "常规"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "接口"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "硬件地址"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "驱动程序"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "速度"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "安全性："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "默认路由"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "已忽略"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "热点"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "密码："
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN 类型"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN 网关"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN 用户名"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN Banner"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "基本连接"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "未知"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "未找到合法的活动连接！"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -961,16 +982,16 @@ msgstr ""
 "版权所有©2005-2008 Novell公司\n"
 "和许多其他社区贡献者和翻译"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序。"
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager 网站"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "Martin Liu <martin@aws-faq.com>, 2015\n"
@@ -984,39 +1005,39 @@ msgstr ""
 "Leah Liu <lliu@redhat.com>, 2008-2009\n"
 "Xi Huang <xhuang@redhat.com>, 2006-2007"
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "网络管理器小程序找不到所需的资源(.ui 文件未找到)。"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "缺少资源"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "连接到“%s”需要密码。"
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "需要解锁 SIM PIN"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "需要解锁 SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1024,25 +1045,25 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用前需要一个 SIM PIN 码。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN 代码："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "显示 PIN 码"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "需要解锁 SIM PUK"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "需要解锁 SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1050,95 +1071,95 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用前需要一个 SIM PUK 码。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK 码："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "新的 PIN 码："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "再次输入新的 PIN 码："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "显示 PIN/PUK 码"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 msgid "Connection had no VPN setting"
 msgstr "连接没有 VPN 设置"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "无法写连接到 VPN UI: %s (%d)"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "无法写连接VPN的用户界面：写不完整"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr "IP 地址用来在网络上标识您的计算机。单击“添加”按钮添加一个 IP 地址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "添加（_A）"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自动获取的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "仅将此连接用于相对应的网络上的资源(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如启用，此连接将不会被用于默认网络连接。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 msgid "C_reate…"
 msgstr "新建(_r)..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "选择连接类型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1150,183 +1171,196 @@ msgstr ""
 "如果您要创建 VPN 连接，但需要的类型不在列表中，您可能没有安装相应的 VPN 插"
 "件。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "设备(_D):"
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "轮循"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "热备"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "异或"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "广播"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "自适应传输负载均衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "自适应负载均衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII(推荐)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
 msgid "Bonded _connections"
 msgstr "已绑定连接(_C)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 #, fuzzy
 msgid "M_ode"
 msgstr "模式(_O)："
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
 msgid "Monitoring _frequency"
 msgstr "监控频率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "毫秒"
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
 msgid "_Interface name"
 msgstr "接口名称(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
 msgid "_Link Monitoring"
 msgstr "链路监视(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 #, fuzzy
 msgid "ARP _targets"
 msgstr "ARP 目标(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr "检测连接状态时使用的 IP 地址，或以逗号分隔的 IP 地址列表。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
 msgid "Link _up delay"
 msgstr "链接建立延时(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
 msgid "Link _down delay"
 msgstr "链接断开延时(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
 msgid "_Primary"
 msgstr "主要(_P)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "字节"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 #, fuzzy
 msgid "Path _cost"
 msgstr "路径成本(_C):"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
 msgid "_Priority"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
 msgid "_Hairpin mode"
 msgstr "_Hairpin 模式："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
 msgid "Bridged _connections"
 msgstr "桥接连接(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
 msgid "_Forward delay"
 msgstr "转发延时(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
 msgid "_Hello time"
 msgstr "问候时间(_H)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP转发延迟，以秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP你好时间（秒）"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 msgid "Enable I_GMP snooping"
 msgstr "启用 I_GMP 监听"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1335,44 +1369,44 @@ msgstr ""
 "控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用，系统可能拒"
 "绝启用该功能直到冲突解决。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "启用 _STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr "控制是否生成树协议（STP）是此桥启用"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr "STP优先这座桥。较低的值是“更好”;优先级最低的桥将被选为根桥。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
 msgid "_Max age"
 msgstr "最大老化时间(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "STP最大消息年龄，单位为秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 #, fuzzy
 msgid "_Aging time"
 msgstr "老化时间(_A)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "以太网MAC地址老化时间，以秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1383,40 +1417,40 @@ msgstr ""
 "00：00：0F必须被转发。因为它们用于STP，MAC暂停帧和LACP掩模不能具有位0，1或2个"
 "组。"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自动"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "默认"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "未指定的错误"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "保留"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "永久的"
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "随机"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 msgid "Stable"
 msgstr "稳定的"
 
-#: ../src/connection-editor/ce-page.c:301
+#: 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 "
@@ -1425,283 +1459,324 @@ msgstr ""
 "此处输入的 MAC 地址将作为在其上激活这个连接的网络设备的硬件地址。该特性被称"
 "作 MAC 克隆 或 spoofing 。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC 地址"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "HW address"
 msgstr "硬件地址"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "对 %2$s %1$s 无效的( %3$s)"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "无效 %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "无效的接口名  %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, c-format
 msgid "invalid interface-name (%s): "
 msgstr "无效的接口名 (%s)"
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "无法解析设备名称"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 msgid "invalid hardware address"
 msgstr "无效的硬件地址"
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "无效 %s (%s):"
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 msgid "device"
 msgstr "设备"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "无效 %s (%s)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "对此连接使用数据中心桥接(DCB)(_U)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "流控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "功能"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "启用"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "通知"
 
 # 基于优先级的流量控制 TLV 单元的一个位，暂无合适翻译
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "Willing"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "优先级"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 msgid "Options…"
 msgstr "选项..."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "优先级组"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "光纤"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "优先级流控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "对每个用户优先级启用或禁用按优先级暂停传输。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 #, fuzzy
 msgid "0"
 msgstr "0："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 #, fuzzy
 msgid "1"
 msgstr "1："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 #, fuzzy
 msgid "2"
 msgstr "2："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 #, fuzzy
 msgid "3"
 msgstr "3："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 #, fuzzy
 msgid "4"
 msgstr "4："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 #, fuzzy
 msgid "5"
 msgstr "5："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 #, fuzzy
 msgid "6"
 msgstr "6："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 #, fuzzy
 msgid "7"
 msgstr "7："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 #, fuzzy
 msgid "Traffic Class"
 msgstr "流量等级："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 #, fuzzy
 msgid "Strict Bandwidth"
 msgstr "严格带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
 msgid "Priority Bandwidth"
 msgstr "优先级带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 #, fuzzy
 msgid "Group Bandwidth"
 msgstr "组带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 #, fuzzy
 msgid "Group ID"
 msgstr "组标识："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "为每个 用户优先级 输入 优先级组 标识。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 "输入允许每个优先级组可以使用的连接带宽百分比。所有组的总和必须为 100%。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "输入允许各个 用户优先级 使用的 优先级组 带宽百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "为各个 用户优先级 启用或禁用带宽限制。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "为各个 用户优先级 输入流量等级。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
 msgid "_Username"
 msgstr "用户名(_U)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE 服务验证的用户名。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr "只有启动与接入集中器可提供指定服务会话。对于大多数供应商这应该是空白。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 #, fuzzy
 msgid "_Service"
 msgstr "服务(_S)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE 服务验证的密码。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
 msgid "_Password"
 msgstr "密码(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 #, fuzzy
 msgid "PPP _interface"
 msgstr "上级接口(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 #, fuzzy
 msgid "P_arent interface"
 msgstr "上级接口(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "的任意名称分配给新创建的PPP接口。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "在其上PPP连接将被建立的接口。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 #, fuzzy
 msgid "C_laim interface"
 msgstr "上级接口(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1709,141 +1784,133 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "双绞线(TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "附件单元接口(AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "媒体独立接口(MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/秒"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/秒"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/秒"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/秒"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "半"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "全"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "手动"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
 msgid "_Port"
 msgstr "端口(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-#, fuzzy
-msgid "_Device"
-msgstr "设备(_D):"
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
 msgid "C_loned MAC address"
 msgstr "克隆 MAC 地址(_L)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 #, fuzzy
 msgid "Wake on LAN"
 msgstr "私钥密码(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 msgid "De_fault"
 msgstr "默认(_f)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 msgid "_Broadcast"
 msgstr "广播(_B)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
 msgid "_Wake on LAN password"
 msgstr "私钥密码(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "网络唤醒密码（以太网MAC）。它仅适用于魔术包。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1852,12 +1919,12 @@ msgstr ""
 "设备链路协商。如果“手动”选择，“速度”和“双面打印”的值将不检查设备的兼容性被强"
 "制。如果不确定，离开这里“忽略”或选择“自动”。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
 msgid "_Speed"
 msgstr "速度(_S)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1866,12 +1933,12 @@ msgstr ""
 "静态链路协商速度值，只有当“忽略”和“自动”选项没有被选中需要。指定的速度值一定"
 "在你的设备支持它。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
 msgid "Duple_x"
 msgstr "全双工(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1880,35 +1947,35 @@ msgstr ""
 "静态链路协商双工值，只有当“忽略”和“自动”选项没有被选中需要。指定双工模式前务"
 "必您的设备支持它。"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 #, fuzzy
 msgid "No"
 msgstr "无"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "所有用户都可以连接这个网络(_U)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
 msgid "Automatically connect to _VPN"
 msgstr "使用此连接时自动连接 _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
 msgid "Firewall _zone"
 msgstr "防火墙区(_Z)："
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
 msgid "_Metered connection"
 msgstr "已组队的连接(_T)："
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1916,12 +1983,12 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
 msgid "Connect _automatically with priority"
 msgstr "忽略自动获取的路由(_N)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1930,7 +1997,7 @@ msgstr ""
 "用于自动激活连接优先级。具有更高编号的连接选择用于自动激活配置文件时是优选"
 "的。默认值是0。"
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 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."
@@ -1938,7 +2005,7 @@ msgstr ""
 "IP 地址用来在网络上标识您的计算机。单击“添加”按钮添加一个 IP 静态地址以用来作"
 "为自动 IP 地址的一个补充。"
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1948,131 +2015,130 @@ msgstr ""
 "IP地址在网络上标识您的计算机，并确定分配给其他计算机的地址范围。点击“添加”按"
 "钮，添加一个IP地址。如果没有提供地址，范围将被自动地确定。"
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 msgid "Additional static addresses"
 msgstr "额外的静态地址"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "地址（可选）"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "数据报文"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "已连接"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 #, fuzzy
 msgid "_Transport mode"
 msgstr "传输模式(_T)："
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "设备名称 + 编号"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "以太网设备"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "自动使用手工设置的 DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "本地连接"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "与其它计算机共享"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
 msgid "_Method"
 msgstr "方法(_M)："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer’s configuration. If you wish to use a DHCP client identifier, "
@@ -2081,45 +2147,43 @@ msgstr ""
 "DHCP 客户端标识符允许网络管理员定制您的计算机配置。如果要使用 DHCP 客户端标识"
 "符，请在此输入。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "解析主机名时使用的域。用逗号分隔多个域。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
 msgid "D_HCP client ID"
 msgstr "D_HCP 客户端 ID："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
 msgid "S_earch domains"
 msgstr "搜索域(_E)："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
 msgid "DNS ser_vers"
 msgstr "_DNS 服务器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
 msgstr "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "需要 IPv_4 地址完成这个连接"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2127,34 +2191,34 @@ msgstr ""
 "当连接到兼容 IPv6 的网络时，如果 IPv4 配置失败而 IPv6 配置成功，则允许连接完"
 "成。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "路由(_R)..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "已启用(公共地址优先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "已启用(临时地址优先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "稳定的隐私"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2163,20 +2227,20 @@ msgstr ""
 "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接"
 "地址会自动配置到连接中的接口。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 #, fuzzy
 msgid "IPv6 _privacy extensions"
 msgstr "IPv6 隐私扩展(_P)："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 地址完成这个连接"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2184,48 +2248,48 @@ msgstr ""
 "当连接到兼容 IPv4 的网络时，如果 IPv6 配置失败而 IPv4 配置成功，则允许连接完"
 "成。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "检查"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "严格"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "该MAC安全设备的名称。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr "作为此MACSec数据接口应创建父接口的名称或父连接UUID。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr "作为此的MACsec接口应创建父接口的名称或父连接UUID"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " 预共享连接关联项名称"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "预共享连接关联密钥"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2234,356 +2298,356 @@ msgstr ""
 "指定CAK（连接协会键）MKA（MAC安全密钥协商）如何获得。对于EAP模式，填补了"
 "802.1X安全页面的参数"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "指定传入帧验证模式"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "无论是传输的信息量必须加密"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "的SCI的端口分量（安全通道标识符）"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
 msgid "Nu_mber"
 msgstr "编号(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 #, fuzzy
 msgid "_APN"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
 msgid "N_etwork ID"
 msgstr "网络 ID (_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 msgid "Change…"
 msgstr "更改..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 #, fuzzy
 msgid "P_IN"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "如果主网络不可用则允许漫游(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "显示密码(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "认证"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 #, fuzzy
 msgid "Allowed methods"
 msgstr "允许的方法："
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "配置方法(_M)..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "压缩"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "使用点到点加密(MPPE)(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "需要 128 位加密(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "使用带有状态的 MPPE(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "允许 _BSD 数据压缩"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "允许 _Deflate 数据压缩"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "使用 TCP 头压缩(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "回声"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "发送 PPP 回响包(_E)"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "无"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "对于浏览器只"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "使用仅用于浏览器客户端/方案此代理配置。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "要获得从哪里PAC脚本URL。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 msgid "Import script from a file…"
 msgstr "从一个文件中导入脚本..."
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 #, fuzzy
 msgid "Method"
 msgstr "方法(_M)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 msgid "Ad_vanced…"
 msgstr "高级(_v)"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "通过设置主"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 msgid "Ethernet port state"
 msgstr "以太网端口状态"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "管理团队高级选项"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
 msgstr "不请自来的港定居人士及港后发送免费ARP报文的突发数启用或禁用。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "队列的ID此端口应该被映射到。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "有源备份选项亚军"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
 msgid "_Port priority"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "端口优先级。该数字越大，意味着更高的优先级。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "端口_sticky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP亚军选项"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
 msgid "_LACP port priority"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
 msgid "LACP port _key"
 msgstr "私钥(_K)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr "根据LACP标准端口的优先级。较低的数字意味着更高的优先级。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr "根据LACP标准端口关键。它只能使用相同的密钥来聚合端口。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
 msgid "_Up delay"
 msgstr "链接建立延时(_U)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
 msgid "_Down delay"
 msgstr "链接断开延时(_D)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
 msgid "Send _interval"
 msgstr "上级接口(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 #, fuzzy
 msgid "_Source host"
 msgstr "ARP 目标(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
 msgid "_Target host"
 msgstr "ARP 目标(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr "主机名转换为将被填充到ARP请求作为源地址的IP地址。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr "主机名转换为将被填充到请求作为目的地地址的IP地址。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "忽略来自_active端口的报文无效"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2591,13 +2655,13 @@ msgstr ""
 "在验证活动端口收到的ARP报文。如果没有选中，所有传入的ARP数据包会被认为是一个"
 "很好的答复。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "忽略来自i_nactive端口的报文无效"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2605,202 +2669,201 @@ msgstr ""
 "在验证活动端口收到的ARP报文。如果没有选中，所有传入的ARP数据包会被认为是一个"
 "很好的答复。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "S_end上不活动端口"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
 msgstr "默认情况下，ARP请求仅活动端口发送。该选项允许在不活动端口发送连。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 msgid ""
 "The delay between the link going down and the runner being notified about it."
 msgstr "的链路down和亚军之间的延迟被通知这件事。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "请求之间的时间间隔被发送。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "发送链接表初始化和第一个请求之间的延迟。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "要使用的链接守望者。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "链接守望者"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 msgid "Im_port team configuration from a file…"
 msgstr "从文件导入组配置(_p)..."
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
 msgid "Edit _JSON configuration"
 msgstr "_JSON 配置："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "原始配置"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "最高优先级"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "最高优先级（稳定）"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 msgid "Bandwidth"
 msgstr "带宽"
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "端口数量最多"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 msgid "Port priority"
 msgstr "端口优先级"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 msgid "From the team device"
 msgstr "来自于组设备"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "来自于活动端口"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "从活动端口到组设备"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
 msgid "_Teamed connections"
 msgstr "已组队的连接(_T)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "负载均衡"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "任何L3协议"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 msgid "TCP"
 msgstr "TCP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "任何L4协议"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
 msgid "_Hardware Address"
 msgstr "硬件地址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr "新的团队所需的设备的硬件地址。通常MAC地址的格式被接受。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
 msgid "_Hardware address policy"
 msgstr "硬件地址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "使用亚军的名称。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "发送LACPDU _periodically框架"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
@@ -2808,11 +2871,11 @@ msgstr ""
 "如果选中，LACPDU帧沿着配置链接定期发送。如果不是这样，“说话的时候说话”它作"
 "为。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "发送一帧LACPDU第二_every"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2821,229 +2884,225 @@ msgstr ""
 "选项指定在我们的链接伙伴被要求发送LACPDU包的速率。如果选中，数据包将被每秒一"
 "次发送。否则，他们将每隔30秒发送。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
 msgid "_System priority"
 msgstr "优先级(_P)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "系统优先级，值可以是0  -  65535。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
 msgstr "指定端口必须在主接口断言载体前活性的最小数量，值可以是1  -  255。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "这将选择的聚合将如何选择的政策。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr "应用于分组的Tx散列计算片段类型（字符串）的列表。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Fields发送哈希"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "在十分之一秒。再平衡之间的周期性时间间隔。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr "活跃的Tx平衡器的名称。活动的Tx平衡默认情况下禁用。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
 msgid "Transmission _balancing interval"
 msgstr "传输功率(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
 msgid "_Transmission balancer"
 msgstr "传输功率(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "运行者"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
 msgid "_Parent interface"
 msgstr "上级接口(_P)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
 msgid "VLAN inter_face name"
 msgstr "VLAN 接口名称(_N)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
 msgid "Cloned MAC _address"
 msgstr "克隆 MAC 地址(_C)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 #, fuzzy
 msgid "VLAN _id"
 msgstr "VLAN 标签(_I)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 #, fuzzy
 msgid "Flags"
 msgstr "标志:"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "标题重新排序(_R)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP(_G)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "松散结合(_L)"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "设备名称 + 编号"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "vlan + 数字"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
 msgid "S_ecurity"
 msgstr "安全(_E)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "客户端"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "热点"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 #, fuzzy
 msgid "Transmission po_wer"
 msgstr "传输功率(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/秒"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 #, fuzzy
 msgid "_Rate"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 #, fuzzy
 msgid "_BSSID"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 #, fuzzy
 msgid "C_hannel"
 msgstr "频道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 #, fuzzy
 msgid "Ban_d"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 #, fuzzy
 msgid "SS_ID"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "执行这个动作需要 polkit 授权"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "允许的认证方法"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "可扩展认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "密码认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "挑战握手认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "微软挑战握手认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "微软挑战握手认证协议第二版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
 "methods. If connections fail, try disabling support for some methods."
@@ -3051,67 +3110,65 @@ msgstr ""
 "多数情况下，服务商的 PPP 服务器会支持所有认证方法。如连接失败，请尝试禁用对一"
 "些方法的支持。"
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "绑定"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "组队"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP 隧道"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
@@ -3119,396 +3176,392 @@ msgstr ""
 "\n"
 "错误：没有 VPN 服务类型。"
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "选择要导入的文件"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "虚拟"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 msgid "Import a saved VPN configuration…"
 msgstr "导入一个保存的 VPN 配置..."
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由于一个未知错误，连接编辑器对话框无法初始化。"
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "无法建立新连接"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "删除连接失败"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "是否确认删除连接 %s？"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 #, fuzzy
 msgid "_New Connection"
 msgstr "_VPN 连接"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "地址"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "子网掩码"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "网关"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "度量"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "前缀"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "正在编辑 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "编辑未命名连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 msgid "Missing connection name"
 msgstr "缺少连接名"
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 msgid "Editor initializing…"
 msgstr "编辑器正在初始化…"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 msgid "Connection cannot be modified"
 msgstr "连接不能被修改"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "无效设置 %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "连接编辑器找不到所需的一些资源(未找到 .ui 文件)。"
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "保存对此连接的全部更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为本机所有用户保存此连接需要认证。"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "无法创建连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "无法编辑连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "创建连接编辑器对话框出现未知错误。"
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 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:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "初始化编辑器错误"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "添加连接失败"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "固定"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "安全标签可能会阻止一些文件和证书认证一起使用。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
 msgid "Connection _name"
 msgstr "连接名称(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 msgid "_Export…"
 msgstr "导出(_E)..."
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "文件重新标记"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Relabel"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr "下列文件没有被标记为与证书认证使用。你要调整的标签？"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "重新标记"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "文件名"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "从不"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "现在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟以前"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时以前"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "连接不能被删除"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "选择一个连接到编辑"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "选择一个连接删除"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名称"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "最后使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "进行认证以编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "进行认证以删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, fuzzy, c-format
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
 msgid "Unrecognized connection type"
 msgstr "不支持的移动宽带连接类型。"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, fuzzy, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 #, fuzzy
 msgid "Error importing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 #, fuzzy
 msgid "Connection type not specified."
 msgstr "连接不能被修改"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "未安装 VPN 插件。"
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "没有找到 UUID 为 “%s” 的连接"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "网络连接"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "添加一个新的连接"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X 安全性"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "无法加载 802.1X 安全配置用户界面。"
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "对此连接使用 802.1_X 安全配置"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "蓝牙设备的 MAC 地址。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 msgid "Could not load Bluetooth user interface."
 msgstr "无法加载蓝牙用户界面。"
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "无效的蓝牙设备 (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "蓝牙连接 %d "
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 msgid "Bluetooth Type"
 msgstr "蓝牙类型"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "选择蓝牙连接配置的类型。"
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 msgid "_Personal Area Network"
 msgstr "个人区域网(_P)"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 msgid "_Dial-Up Network"
 msgstr "拨号网络(_D)"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "无法加载绑定用户界面。"
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "主要"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "无法加载桥接用户界面。"
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "桥接连接 %d"
@@ -3516,36 +3569,36 @@ msgstr "桥接连接 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "桥接端口"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "无法加载桥接端口用户界面。"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "缺少父接口"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: 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”, "
@@ -3554,41 +3607,40 @@ msgstr ""
 " 此选项将锁定该连接到通过接口名称或永久 MAC 地址或两者指定的网络设备。例"
 "如：“em1”，“3C:97:0E:42:1A:19”，“em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 msgid "ignored"
 msgstr "已忽略"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "无法加载以太网用户界面。"
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 msgid "Ethernet device"
 msgstr "以太网设备"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 msgid "cloned MAC"
 msgstr "克隆 MAC"
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "网络唤醒密码"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "默认"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3597,11 +3649,11 @@ msgstr ""
 "区(zone)定义了连接的信任等级。默认值不是常规区，选择它会使用防火墙的默认区设"
 "置。只在防火墙启用时有用。"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "无法加载常规用户界面。"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: 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:"
@@ -3612,278 +3664,268 @@ msgstr ""
 "“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)”"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "无法加载 InfiniBand 用户界面。"
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "Infiniband 设备"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 连接 %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 msgid "Could not load IP tunnel user interface."
 msgstr "无法加载 IP 隧道用户界面。"
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP 隧道连接 %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "自动(VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "自动(VPN)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "自动，仅地址"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "自动(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自动(PPPoE)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "自动(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "自动(DHCP)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
 msgid "Additional DNS ser_vers"
 msgstr "附加 _DNS 服务器："
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
 msgid "Additional s_earch domains"
 msgstr "附加搜索域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "正在编辑 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 设置"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "无法加载 IPv4 用户界面。"
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4 地址 “%s” 无效"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4 地址子网掩码 “%s” 无效"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4 网关 “%s” 无效"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS 服务器 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "正在编辑 %s 的 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "无法加载 IPv6 用户界面。"
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6 地址 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6 前缀 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6 网关 “%s” 无效"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS 服务器 “%s” 无效"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "无法加载的MACsec用户界面。"
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSec数据连接 %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "重叠的从机"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "从机“%s”与“%s”都应用于设备“%s“"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr "从机“%s”和“%s”应用于同一物理设备的不同虚拟端口(“%s”和“%s”)。"
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s 从机 %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "无法加载移动宽带用户界面。"
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支持的移动宽带连接类型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "选择移动宽带提供商类型"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr "选择移动宽带提供商使用的技术。如不确定，请询问您的提供商。"
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDPA)"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "无"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "正在编辑 %s 的 PPP 认证方法"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP 设置"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "无法加载 PPP 用户界面。"
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "代理"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 msgid "Could not load proxy user interface."
 msgstr "无法加载代理用户界面。"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: 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"
 msgstr "错误：文件不含任何有效的 JSON 配置"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "无法加载组队用户界面。"
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "组队连接 %d"
@@ -3891,68 +3933,67 @@ msgstr "组队连接 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "组队端口"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:413
+#: src/connection-editor/page-vlan.c:413
 #, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (通过“%s”）"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, c-format
+#: src/connection-editor/page-vlan.c:425
 msgid "New connection…"
 msgstr "新连接…"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "无法加载 VLAN 用户界面。"
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan 上级"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "无法为 “%s” (%s) 加载编辑器 VPN 插件。"
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 msgid "unknown failure"
 msgstr "未知的失败"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "无法加载 VPN 用户界面。"
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "无法找到 “%s” 的 VPN 插件。"
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 连接 %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "选择 VPN 连接类型"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 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 "
@@ -3961,7 +4002,7 @@ msgstr ""
 "请为新建连接选择一个 VPN 类型。如果您希望使用的 VPN 连接类型未出现在列表中，"
 "则意味着您可能没有安装正确的 VPN 插件。"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: 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"
@@ -3969,7 +4010,7 @@ msgstr ""
 "此选项可将此连接锁定至以在此输入的 BSSID 指定的 Wi-Fi 访问点(AP)。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: 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”, "
@@ -3978,93 +4019,91 @@ msgstr ""
 " 此选项将锁定该连接到通过接口名称或永久 MAC 地址或两者指定的网络设备。例"
 "如：“wlan0”，“3C:97:0E:42:1A:19”，“wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "无法加载 Wi-Fi 用户界面。"
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 msgid "Wi-Fi device"
 msgstr "Wi-Fi 设备"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128 位密钥(十六进制或 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "动态 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "无法加载 Wi-Fi 安全性用户界面，缺少 Wi-Fi 设置。"
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "无法加载 Wi-Fi 安全性用户界面。"
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "缺少 SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "安全与 Ad-Hoc 模式不兼容"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "是否要将 %s 替换为您正在保存的 VPN 连接？"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "无法导出 VPN 连接"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4075,198 +4114,171 @@ msgstr ""
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 msgid "Export VPN connection…"
 msgstr "导出 VPN 连接..."
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "解锁(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "自动解锁此设备"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "连接信息"
 
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "关闭（_C）"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "活动的网络连接"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 msgid "No certificate set"
 msgstr "无证书"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "无密钥"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "为 %s 证书选择一个密钥"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "私钥(_K)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "私钥密码(_P)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, c-format
 msgid "Choose %s Certificate"
 msgstr "选择 %s 证书"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "用户证书(_U)："
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "我所在国家/地区没有被列出"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed…"
 msgstr "我的套餐未被列出..."
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "提供商"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "国家或地区"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安装的 GSM 设备"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安装的 CDMA 设备"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "任何设备"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新移动宽带连接"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "您将需要以下信息："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider’s name"
 msgstr "宽带提供商的名称"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "您的宽带付费套餐名称"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "(在某些情况下)您的宽带付费套餐 APN (访问点名称)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "为此移动宽带设备创建一个连接(_T)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "设置一个移动宽带连接"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "国家或地区列表："
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "国家或地区"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider’s Country or Region"
 msgstr "选择您的提供商的国家或地区"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "从列表中选择您的提供商(_L)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "找不到我的提供商，希望手动输入(_M)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "我的提供商使用 GSM 技术(GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "我的提供商使用 CDMA 技术(1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "选择您的提供商"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "选择您的套餐(_S)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "所选套餐的 _APN (访问点名称)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 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"
@@ -4277,37 +4289,31 @@ msgstr ""
 "\n"
 "如果您不确定您的套餐，请询问您的提供商以获取套餐的 APN。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "选择您的付费套餐"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "您的移动宽带连接已按以下设定配置："
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "您的设备："
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "您的服务商："
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "您的套餐："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 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 "
@@ -4319,220 +4325,227 @@ msgstr ""
 "访问网络资源，请检查您的设置。要修改您的移动宽带设置，在系统 >> 首选项菜单中"
 "选择“网络连接”。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "确认移动宽带设置"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "键入 %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, c-format
 msgid "Certificate in %s"
 msgstr "%s 中的证书"
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "(未知信息)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "选择"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "从文件选择..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, c-format
 msgid "Choose a %s Certificate"
 msgstr "选择一个 %s 证书"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
 msgid "%s certificate _password"
 msgstr "用户证书(_U)："
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "错误日志中： "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 msgid "Error opening a session: "
 msgstr "打开一个会话出错:"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 msgid "_Unlock token"
 msgstr "解锁令牌(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "由...发出"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "输入 %s PIN码"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "登录(_L)"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_Remember PIN"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "仅为该用户存储密码"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "存储所有用户的密码"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "每次询问这个密码"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "不需要密码"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "显示密码(_O)"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Tertiary Password:"
 msgstr "三元密码(_T)："
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "次要密码(_S)："
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "点击连接"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "新…"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "无"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "动态 WEP (802.1x)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "访问 Wi-Fi 网络 %s 需要密码或加密密钥。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
 msgid "Wi-Fi _security"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
 msgid "C_onnection"
 msgstr "连接(_O)："
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
 msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi 适配器(_A)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "找不到我的提供商，希望手动输入(_m)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "提供商："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "国家或地区列表："
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "国家或地区"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "有线"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4542,13 +4555,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4556,27 +4569,27 @@ msgstr ""
 "密码丢失或连接无效。如果连接无效，您首选需要用 nm-connection-editor 来编辑网"
 "络连接"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "网络名称(_N)："
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "连接(_O)："
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi 适配器(_A)："
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4584,354 +4597,352 @@ msgstr ""
 "此程序是 NetworkManager 的一个组件(https://wiki.gnome.org/Projects/"
 "NetworkManager/)。"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "它不是被设计用于命令行交互的，您应该在 GNOME 桌面环境中运行。"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未启用"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未注册"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家庭网络(%s)"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "家庭网络"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "正在搜索"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "注册被拒绝"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s(%s 漫游中)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s(漫游中)"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫游网络(%s)"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "漫游网络"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM 卡 “%s”（“%s”）的 PIN 码不"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码。"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "移动宽带连接“%s”处于活动状态：(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "漫游中"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s 连接"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "PEM 证书 (*.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER，PEM 或 PKCS#12 私钥 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "在 802.1X 安全性中不确定的错误 (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 msgid "no CA certificate selected"
 msgstr "没有选择 CA 证书"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "所选的CA证书文件不存在"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少 EAP-FAST PAC 文件"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 msgid "Choose a PAC file"
 msgstr "选择一个 PAC 文件"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "所有文件"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "已认证"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "两者兼用"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名身份(_M)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 文件(_F)："
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "内部认证(_I)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "缺少 EAP-LEAP 用户名"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "缺少 EAP-LEAP 密码"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 证书(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "服务器证书名称的后缀。"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "缺少 EAP 用户名"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "缺少 EAP 密码"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "显示密码(_O)"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "缺少 EAP-TLS 身份"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 msgid "no user certificate selected"
 msgstr "没有选择用户证书"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "选择用户证书文件不存在"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "没有选择的关键"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "选择的关键文件不存在"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
 msgid "I_dentity"
 msgstr "身份(_D)："
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (no EAP)"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "未知错误验证 802.1X 安全性"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
 msgid "Au_thentication"
 msgstr "认证(_T)："
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "缺少 leap 用户名"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "缺少 leap 密码"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "缺少 wep-key"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "无效的 wep-key：%zu 长度的密钥只能包含十六进制数字"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "无效的 wep-key：%zu 长度的密钥只能包含 ASCII 字符"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -4940,41 +4951,41 @@ msgstr ""
 "无效的 wep-key：错误的密钥长度%zu。密钥必须由长度 5/13 (ASCII) 或 10/26 (十六"
 "进制)组成"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "无效的 wep-key：密码必须非空"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "无效的 wep-key：密码必须少于64个字符"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "开放式系统"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (默认)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
 msgid "_Key"
 msgstr "密钥(_K)："
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "显示密钥(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)："
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -4982,15 +4993,24 @@ msgid ""
 msgstr ""
 "无效的 wpa-psk：无效的密钥长度 %zu。必须是 [8,63] 字节或 64 个十六进制数字"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "无效的 wpa-psk：不能用 64 个字节作为十六进制解释密钥"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
 msgid "_Type"
 msgstr "类型(_T)："
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (默认)"
+
+#~ msgid "Ignored"
+#~ msgstr "已忽略"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "活动的网络连接"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "由于一个未知错误，更新连接 secret 时失败。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d226dad2..7e4c34d6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,8 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-10 12:44+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2014-08-30 18:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -24,223 +25,246 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3175
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "網絡"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "管理你的網絡連線"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "網絡連線"
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
+#, fuzzy
+msgid "Advanced Network Configuration"
+msgstr "啟用網絡連線"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "管理與更改你的連線設定值"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "停止已連線的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "將這設為 True，以停用網絡連線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "停止已離線的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "將這設為 True，以停用網絡離線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "停用 VPN 的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "停止可用網絡的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "將這設為 True，以停用有 Wi-Fi 無線網絡可用時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "戳記"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "用來決定設定是不是要轉移到新版本上。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "禁止建立 Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網絡。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "在通知區域顯示面板程式"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "忽略 CA 證書"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 #, fuzzy
 msgid "NetworkManager"
 msgstr "NetworkManager 面板程式"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "沒有網絡連接"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager 面板程式"
 
-#: ../shared/nm-utils/nm-shared-utils.c:185
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:192
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:199
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr ""
 
-#: ../shared/nm-utils/nm-shared-utils.c:207
+#: shared/nm-utils/nm-shared-utils.c:816
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:825
 #, 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
+#: shared/nm-utils/nm-shared-utils.c:836
 #, 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
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "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: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:8
-#: ../src/gsm-unlock.ui.h:1 ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/8021x.ui.h:3
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
-msgid "_Network name:"
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
+#, fuzzy
+msgid "_Network name"
 msgstr "網絡名稱(_N)："
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "安全。"
 
-#: ../src/applet.c:381
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:383 ../src/applet.c:437 ../src/applet.c:472
-#: ../src/applet-device-wifi.c:1387 ../src/applet-device-wifi.c:1410
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:386 ../src/applet.c:475 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1390 ../src/applet-device-wifi.c:1413
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:435
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:440
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:470
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:793 ../src/applet-device-wifi.c:1126
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:883
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -250,7 +274,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網絡連線中斷了。"
 
-#: ../src/applet.c:885
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -260,7 +284,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網絡連線被中斷了。"
 
-#: ../src/applet.c:887
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -269,7 +293,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:889
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -279,7 +303,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:891
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -288,7 +312,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:893
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -297,7 +321,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:895
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -306,7 +330,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:897
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -315,7 +339,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:899
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -324,7 +348,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為無效的 VPN 機密。"
 
-#: ../src/applet.c:904
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -333,7 +357,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:931
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -343,19 +367,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:933
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:935
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:943 ../src/applet.c:983
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:987
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -368,7 +392,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -381,560 +405,585 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1279
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1281
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1291 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1307
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1321
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1394
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "沒有可用的網絡裝置"
 
-#: ../src/applet.c:1448
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1492
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1495
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1601
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1606 ../src/applet.c:2671
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "網絡已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1816
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "啟用網絡(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1825
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1834
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "啟用流動寬頻(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1846
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1858
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1866
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "編輯連線…"
 
-#: ../src/applet.c:1880
+#: src/applet.c:1895
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2191
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "你現在已連線至「%s」。"
 
-#: ../src/applet.c:2231
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2232
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "網絡連線已中斷。"
 
-#: ../src/applet.c:2534
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "正在準備網絡連線「%s」…"
 
-#: ../src/applet.c:2537
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2540 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:608
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "正在要求提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2543
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "網絡連線「%s」在使用中"
 
-#: ../src/applet.c:2616
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2619
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2622
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "正在要求 VPN 提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2625
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2675
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "沒有網絡連接"
 
-#: ../src/applet.c:3276
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK 碼錯誤，請聯絡你的供應商。"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN 碼錯誤，請聯絡你的供應商。"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:506
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "流動寬頻 (%s)"
 
-#: ../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
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "流動寬頻"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:906
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "可用"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "新的流動寬頻連線"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1308
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "已建立連線"
 
-#: ../src/applet-device-broadband.c:818
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "你現在已連線至流動寬頻網絡。"
 
-#: ../src/applet-device-broadband.c:958 ../src/applet-device-broadband.c:964
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "流動寬頻網絡。"
 
-#: ../src/applet-device-broadband.c:959
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "你現在已註冊至家用網絡。"
 
-#: ../src/applet-device-broadband.c:965
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "你現在已註冊至漫遊網絡。"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "你現在已連線至流動寬頻網絡。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "正在準備流動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "正在設定流動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "流動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "流動寬頻連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動乙太網絡"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "你現在已連線至有線網絡。"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "正在準備有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "正在設定有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "有線網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "正要求有線網絡「%s」提供網絡位址…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "有線網絡連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "連接到隱藏的 Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "建立新的 Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1408
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:838
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:840
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:842
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:871
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬件開關停用"
 
-#: ../src/applet-device-wifi.c:933
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "更多網絡"
 
-#: ../src/applet-device-wifi.c:1122
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網絡可用"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網絡選單來連線到 Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:1307
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "你現在已連線至 Wi-Fi 網絡「%s」。"
 
-#: ../src/applet-device-wifi.c:1342
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "正在準備 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1345
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "正在設定 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1348
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi 網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1351
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "正在要求提供「%s」的 Wi-Fi 網絡位址…"
 
-#: ../src/applet-device-wifi.c:1362
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi 網絡連線「%s」在使用中： %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1366
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi 網絡連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1385
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../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
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:74
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
-#: ../src/applet-dialogs.c:230
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:151
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "地址"
 
-#: ../src/applet-dialogs.c:226
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
-#: ../src/connection-editor/page-wifi-security.c:330
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "%s (default)"
-msgstr "%s (預設值)"
-
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
 #. Address
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "廣播位址"
 
 #. Prefix
-#: ../src/applet-dialogs.c:381
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "子網絡遮罩"
 
-#: ../src/applet-dialogs.c:492
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "主要 DNS："
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "次要 DNS："
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Tertiary DNS"
+msgstr "第三 DNS："
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網絡 (%s)"
 
-#: ../src/applet-dialogs.c:495
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:502
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:504
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:516
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "介面"
 
-#: ../src/applet-dialogs.c:536
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "硬件位址"
 
 #. Driver
-#: ../src/applet-dialogs.c:550
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "驅動程式"
 
-#: ../src/applet-dialogs.c:585
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "速度"
 
-#: ../src/applet-dialogs.c:600
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "安全性："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "預設路由"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
-msgid "Ignored"
-msgstr "已忽略"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "密碼："
+
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN 類型"
 
-#: ../src/applet-dialogs.c:822
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN 閘道器"
 
-#: ../src/applet-dialogs.c:828
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN 使用者名稱"
 
-#: ../src/applet-dialogs.c:834
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN 旗幟"
 
-#: ../src/applet-dialogs.c:840
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "基礎連線"
 
-#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:957
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線！"
 
-#: ../src/applet-dialogs.c:985
+#: src/applet-dialogs.c:1142
 #, fuzzy
 msgid ""
-"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -942,48 +991,52 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "與許多其他社羣貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:988
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理你的網絡裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:990
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:1001
+#: src/applet-dialogs.c:1151
+msgid "translator-credits"
+msgstr ""
+
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/applet-dialogs.c:1006
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "流動寬頻網絡密碼"
 
-#: ../src/applet-dialogs.c:1040
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1055
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "密碼："
 
-#: ../src/applet-dialogs.c:1337
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1338
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1340
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -991,25 +1044,25 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1342
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN 碼："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1346
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1348
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1349
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1351
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1017,91 +1070,98 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1353
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK 碼："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1356
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "新的 PIN 碼："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1358
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "顯示 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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "_OK"
-msgstr "確定(_O)"
+#: src/applet-vpn-request.c:408
+#, fuzzy
+msgid "Connection had no VPN setting"
+msgstr "連線資訊"
+
+#: src/applet-vpn-request.c:458
+#, fuzzy, c-format
+msgid "Failed to write connection to VPN UI: %s (%d)"
+msgstr "無法建立 DUN 連線：%s"
+
+#: src/applet-vpn-request.c:466
+msgid "Failed to write connection to VPN UI: incomplete write"
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr "用來在網絡上區別你的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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: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
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr ""
 
-#. Delete
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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: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:711
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自動獲得的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "只在使用這個連線的網絡資源時，才使用此連線(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如果啟用，這個連線將永遠不會做為預設網絡連線。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "建立…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1113,208 +1173,284 @@ msgstr ""
 "如果要建立 VPN，而你想要建立的 VPN 連線類型沒有出現在清單中，可能是沒有安裝正"
 "確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "服務(_S)："
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "循環分配 (Round-robin)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "自動備援 (Active-backup)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "廣播"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "適應性傳輸負載平衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "適應性負載平衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (建議值)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
+#: src/connection-editor/ce-page-bond.ui:91
+#, fuzzy
+msgid "Bonded _connections"
 msgstr "繫結的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
+#, fuzzy
+msgid "M_ode"
 msgstr "模式(_O)："
 
-#. 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:14
-#: ../src/connection-editor/nm-connection-list.c:695
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "Monitoring _frequency:"
+#: src/connection-editor/ce-page-bond.ui:238
+#, fuzzy
+msgid "Monitoring _frequency"
 msgstr "監控頻率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "毫秒"
 
-#: ../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:16
-msgid "_Interface name:"
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
+#, fuzzy
+msgid "_Interface name"
 msgstr "介面名稱(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "_Link Monitoring:"
+#: src/connection-editor/ce-page-bond.ui:316
+#, fuzzy
+msgid "_Link Monitoring"
 msgstr "連線監控(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "ARP _targets:"
+#: src/connection-editor/ce-page-bond.ui:347
+#, fuzzy
+msgid "ARP _targets"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "一個 IP 位址，或以逗號分隔的 IP 位址清單，這是在檢查連線狀態時查詢用的。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _up delay:"
+#: src/connection-editor/ce-page-bond.ui:373
+#, fuzzy
+msgid "Link _up delay"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-msgid "Link _down delay:"
+#: src/connection-editor/ce-page-bond.ui:387
+#, fuzzy
+msgid "Link _down delay"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "_Primary:"
+#: src/connection-editor/ce-page-bond.ui:481
+#, fuzzy
+msgid "_Primary"
 msgstr "主要(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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:17
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:8
-msgid "_MTU:"
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
+#, fuzzy
+msgid "_MTU"
 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:18
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "位元組"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
-msgid "Path _cost:"
+#: src/connection-editor/ce-page-bridge-port.ui:42
+#, fuzzy
+msgid "Path _cost"
 msgstr "路徑成本(_C)："
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-msgid "_Priority:"
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
+#, fuzzy
+msgid "_Priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-msgid "_Hairpin mode:"
+#: src/connection-editor/ce-page-bridge-port.ui:97
+#, fuzzy
+msgid "_Hairpin mode"
 msgstr "_Hairpin 模式："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
-msgid "Bridged _connections:"
+#: src/connection-editor/ce-page-bridge.ui:62
+#, fuzzy
+msgid "Bridged _connections"
 msgstr "橋接的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
-msgid "_Forward delay:"
+#: src/connection-editor/ce-page-bridge.ui:218
+#, fuzzy
+msgid "_Forward delay"
 msgstr "轉送延遲(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-msgid "_Hello time:"
+#: src/connection-editor/ce-page-bridge.ui:232
+#, fuzzy
+msgid "_Hello time"
 msgstr "_Hello 時間："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
+msgid "STP forwarding delay, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:294
+msgid "STP hello time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "啟用網絡(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:332
+msgid ""
+"Controls whether IGMP snooping is enabled for this bridge. Note that if "
+"snooping was automatically disabled due to hash collisions, the system may "
+"refuse to enable the feature until the collisions are resolved."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "啟用 _STP (生成樹協議)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
-msgid "_Max age:"
+#: src/connection-editor/ce-page-bridge.ui:348
+msgid ""
+"Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:363
+msgid ""
+"STP priority for this bridge. Lower values are “better”; the lowest priority "
+"bridge will be elected the root bridge."
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:378
+#, fuzzy
+msgid "_Max age"
 msgstr "最大時間(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
-msgid "_Aging time:"
+#: src/connection-editor/ce-page-bridge.ui:398
+msgid "STP maximum message age, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:434
+#, fuzzy
+msgid "_Aging time"
 msgstr "存續時間(_A)："
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page-bridge.ui:454
+msgid "The Ethernet MAC address aging time, in seconds"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:490
+msgid "Group _forward mask"
+msgstr ""
+
+#: src/connection-editor/ce-page-bridge.ui:504
+msgid ""
+"A mask of 16 bits, each corresponding to a group address in the range from "
+"01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
+"can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause "
+"frames and LACP."
+msgstr ""
+
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自動"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "啟用"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1324,442 +1460,544 @@ msgstr ""
 "在這裏輸入的 MAC 位址會成為這個連線使用的網絡裝置的硬件位址。這個功能也稱為 "
 "MAC 複製或偽裝。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "MAC address"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN 介面名稱(_N)："
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "硬件位址："
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "任何裝置"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:725
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "由於不明的錯誤使連線機密的更新失敗。"
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "在這個連線使用資料中心橋接 (DCB)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "功能"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "啟用"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "廣告"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "意願"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "優先順序"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "選項…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "優先順序羣組"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "光纖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "優先順序流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "根據每個使用者優先順序啟用或停用優先順序暫停傳輸。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
-msgid "Priority:"
-msgstr "優先順序："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
-msgid "0:"
-msgstr "0："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
-msgid "1:"
-msgstr "1："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
-msgid "2:"
-msgstr "2："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
-msgid "3:"
-msgstr "3："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
-msgid "4:"
-msgstr "4："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-msgid "5:"
-msgstr "5："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
-msgid "6:"
-msgstr "6："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
-msgid "7:"
-msgstr "7："
-
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-msgid "Traffic Class:"
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
+msgid "0"
+msgstr "0"
+
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
+msgid "1"
+msgstr "1"
+
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
+msgid "2"
+msgstr "2"
+
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
+msgid "3"
+msgstr "3"
+
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
+msgid "4"
+msgstr "4"
+
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
+msgid "5"
+msgstr "5"
+
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
+msgid "6"
+msgstr "6"
+
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
+msgid "7"
+msgstr "7"
+
+#: src/connection-editor/ce-page-dcb.ui:1069
+#, fuzzy
+msgid "Traffic Class"
 msgstr "流量類別："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-msgid "Strict Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1473
+#, fuzzy
+msgid "Strict Bandwidth"
 msgstr "限制頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-msgid "Priority Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:1805
+#, fuzzy
+msgid "Priority Bandwidth"
 msgstr "優先順序頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
-msgid "Group Bandwidth:"
+#: src/connection-editor/ce-page-dcb.ui:2137
+#, fuzzy
+msgid "Group Bandwidth"
 msgstr "羣組頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
-msgid "Group ID:"
+#: src/connection-editor/ce-page-dcb.ui:2469
+#, fuzzy
+msgid "Group ID"
 msgstr "羣組 ID："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "根據每個使用者優先順序輸入優先順序羣組 ID。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 "輸入每個優先順序羣組可以使用的連線頻寬。所有羣組的總合加起來必須為 100%。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "輸入每個使用者優先順序可以使用的優先順序羣組頻寬百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "根據每個使用者優先順序啟用或停用限制頻寬。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "輸入每個使用者優先順序的流量類別。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
-msgid "_Username:"
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
+#, fuzzy
+msgid "_Username"
 msgstr "使用者名稱(_U)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
+#: src/connection-editor/ce-page-dsl.ui:33
+msgid "Username used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:46
+msgid ""
+"Only initiate sessions with access concentrators that provide the specified "
+"service. For most providers this should be left blank."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:59
+#, fuzzy
+msgid "_Service"
 msgstr "服務(_S)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "_Password:"
+#: src/connection-editor/ce-page-dsl.ui:89
+msgid "Password used to authenticate with the PPPoE service."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
+#, fuzzy
+msgid "_Password"
 msgstr "密碼(_P)："
 
-#: ../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:131
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:116
+#, fuzzy
+msgid "PPP _interface"
+msgstr "介面"
+
+#: src/connection-editor/ce-page-dsl.ui:130
+#, fuzzy
+msgid "P_arent interface"
+msgstr "父介面(_P)："
+
+#: src/connection-editor/ce-page-dsl.ui:144
+msgid "An arbitrary name to assign to the newly created PPP interface."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:160
+msgid "The interface on which the PPP connection will be established."
+msgstr ""
+
+#: src/connection-editor/ce-page-dsl.ui:171
+#, fuzzy
+msgid "C_laim interface"
+msgstr "父介面(_P)："
+
+#: src/connection-editor/ce-page-dsl.ui:175
+msgid ""
+"If selected, the connection will take exclusive control of the interface and "
+"it won’t be possible to activate another connection on it. Note that the "
+"option can only be used for Ethernet interfaces. nm-applet is able to "
+"activate the connection only if this option is selected."
+msgstr ""
+
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "雙絞線 (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "附加單位介面 (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "媒體獨立介面 (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:149
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "手動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
-msgid "_Port:"
+#: src/connection-editor/ce-page-ethernet.ui:97
+#, fuzzy
+msgid "_Port"
 msgstr "連接埠(_P)："
 
-#: ../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
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
-msgid "_Device:"
-msgstr "服務(_S)："
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
-msgid "C_loned MAC address:"
+msgid "C_loned MAC address"
 msgstr "複製的 MAC 位址(_L)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
-msgid "Wake on LAN:"
-msgstr ""
+#: src/connection-editor/ce-page-ethernet.ui:242
+#, fuzzy
+msgid "Wake on LAN"
+msgstr "私密密碼匙密碼(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 #, fuzzy
 msgid "_Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "廣播"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
-msgid "_Wake on LAN password:"
+msgid "_Wake on LAN password"
 msgstr "私密密碼匙密碼(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
-msgid "Lin_k negotiation:"
+#: src/connection-editor/ce-page-ethernet.ui:414
+msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 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:"
+#: src/connection-editor/ce-page-ethernet.ui:448
+#, fuzzy
+msgid "_Speed"
 msgstr "速度(_S)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 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
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
-msgid "Duple_x:"
+msgid "Duple_x"
 msgstr "全雙工(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 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 "當使用這個連線時自動連線至 _VPN"
+#: src/connection-editor/ce-page-general.ui:29
+msgid "Yes"
+msgstr "是"
+
+#: src/connection-editor/ce-page-general.ui:32
+msgid "No"
+msgstr "否"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "所有的使用者可以連線至這個網絡"
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "_Automatically connect to this network when it is available"
-msgstr "當這個網絡可用時自動連線(_A)"
+#: src/connection-editor/ce-page-general.ui:80
+#, fuzzy
+msgid "Automatically connect to _VPN"
+msgstr "當使用這個連線時自動連線至 _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
-msgid "Connection _priority for auto-activation:"
-msgstr "連線資訊(_I)"
+msgid "Firewall _zone"
+msgstr "防火牆地帶(_Z)："
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:121
+#, fuzzy
+msgid "_Metered connection"
+msgstr "隊伍連線(_T):"
+
+#: src/connection-editor/ce-page-general.ui:134
+msgid ""
+"NetworkManager indicates to applications whether the connection is metered "
+"and therefore data usage should be restricted. Select which value (“Yes” or "
+"“No”) to indicate to applications, or “Automatic” to use a default value "
+"based on the connection type and other heuristics."
+msgstr ""
+
+#: src/connection-editor/ce-page-general.ui:150
+#, fuzzy
+msgid "Connect _automatically with priority"
+msgstr "自動連線(_A)"
+
+#: src/connection-editor/ce-page-general.ui:167
 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 "防火牆地帶(_Z)："
-
-#: ../src/connection-editor/ce-page.h:111
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 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 "用來在網絡上區別你的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-page.h:116
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1767,128 +2005,132 @@ msgid ""
 "automatically."
 msgstr ""
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/ce-page.h:122
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.h:123
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "傳輸模式(_T)："
-
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-infiniband.ui:37
+#, fuzzy
+msgid "_Transport mode"
+msgstr "傳輸模式(_T)："
+
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "裝置名稱 + 編號"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 #, fuzzy
 msgid "Mode"
 msgstr "模式(_M)："
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "自動使用手動 DNS 設定值"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "本機連線"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:188
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "分享給其他電腦"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "_Method:"
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
+#, fuzzy
+msgid "_Method"
 msgstr "方法(_M)："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1898,32 +2140,33 @@ msgstr ""
 "DHCP 用戶端識別能讓網管人員客製你電腦上的配置。如果你想要使用 DHCP 用戶端識"
 "別，請在此輸入。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "用來解析主機名稱的網域。請使用逗號隔開不同的網域。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-msgid "D_HCP client ID:"
+#: src/connection-editor/ce-page-ip4.ui:228
+#, fuzzy
+msgid "D_HCP client ID"
 msgstr "D_HCP 用戶端 ID："
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
+#, fuzzy
+msgid "S_earch domains"
 msgstr "搜尋網域(_E)："
 
-#: ../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:"
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
+#, fuzzy
+msgid "DNS ser_vers"
 msgstr "_DNS 伺服器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1931,11 +2174,11 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "需要 IPv_4 addressing 才可完成此連線"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1943,25 +2186,35 @@ msgstr ""
 "當連至可使用 IPv6 的網絡時，若 IPv4 配置失敗，不過 IPv6 配置卻成功的話，請允"
 "許連線完成。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "路由(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "已停用"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "啟用 (偏好公開位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "啟用 (偏好暫時位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: src/connection-editor/ce-page-ip6.ui:52
+msgid "EUI64"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:55
+#, fuzzy
+msgid "Stable privacy"
+msgstr "啟用"
+
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -1970,15 +2223,20 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。Link-local 位址會自動設定到連線中的介面。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "IPv6 _privacy extensions:"
+#: src/connection-editor/ce-page-ip6.ui:287
+#, fuzzy
+msgid "IPv6 _privacy extensions"
 msgstr "I_Pv6 私隱擴充功能："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:319
+msgid "IPv6 address _generation mode"
+msgstr ""
+
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 addressing 才可完成此連線"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1986,755 +2244,862 @@ msgstr ""
 "當連至可使用 IPv4 的網絡時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允"
 "許連線完成。"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-macsec.ui:12
+msgid "PSK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
+
+#: src/connection-editor/ce-page-macsec.ui:35
+msgid "Check"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:38
+#, fuzzy
+msgid "Strict"
+msgstr "度量 (Metric)"
+
+#: src/connection-editor/ce-page-macsec.ui:69
+msgid "The name of the MACsec device."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:94
+msgid ""
+"The parent interface name or parent connection UUID from which this MACSEC "
+"interface should be created."
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:100
+msgid ""
+"The parent interface name or parent connection UUID from which this MACsec "
+"interface should be created"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:113
+msgid " The pre-shared Connectivity-association Key Name"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:124
+msgid "The pre-shared Connectivity Association Key"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:135
+msgid ""
+"Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
+"Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
+"security page"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:154
+msgid "CKN"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:167
+msgid "CAK"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:191
+msgid "Keys"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:207
+msgid "Parameters"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:224
+msgid "Validation"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:236
+#, fuzzy
+msgid "SCI port"
+msgstr "匯入(_I)"
+
+#: src/connection-editor/ce-page-macsec.ui:247
+msgid "Specifies the validation mode for incoming frames"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:263
+msgid "Encrypt"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:267
+msgid "Whether the transmitted traffic must be encrypted"
+msgstr ""
+
+#: src/connection-editor/ce-page-macsec.ui:279
+msgid "The port component of the SCI (Secure Channel Identifier)"
+msgstr ""
+
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "Nu_mber:"
+#: src/connection-editor/ce-page-mobile.ui:48
+#, fuzzy
+msgid "Nu_mber"
 msgstr "數字(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "_APN:"
+#: src/connection-editor/ce-page-mobile.ui:165
+#, fuzzy
+msgid "_APN"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "N_etwork ID:"
+#: src/connection-editor/ce-page-mobile.ui:179
+#, fuzzy
+msgid "N_etwork ID"
 msgstr "網絡 ID(_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "更改…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "P_IN:"
+#: src/connection-editor/ce-page-mobile.ui:242
+#, fuzzy
+msgid "P_IN"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網絡無法使用，允許使用漫遊(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allowed methods:"
+#: src/connection-editor/ce-page-ppp.ui:53
+#, fuzzy
+msgid "Allowed methods"
 msgstr "允許的方式："
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "設定方法(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "使用點對點式加密 (MPPE)(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "需要 128-位元加密(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "使用有狀態的 MPPE(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "允許 _BSD 資料壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "允許 _Deflate 資料壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "使用 TCP 標頭壓縮(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "回響"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "傳送 PPP _echo 封包"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#, fuzzy
-msgid "Method:"
-msgstr "方法(_M)："
-
-#: ../src/connection-editor/ce-page-proxy.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 #, fuzzy
 msgid "None"
 msgstr "沒有"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
-msgid "PAC URL:"
+#: src/connection-editor/ce-page-proxy.ui:52
+msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
-msgid "URL from where the PAC script is to be obtained."
+#: src/connection-editor/ce-page-proxy.ui:64
+msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
-msgid "PAC script:"
+#: src/connection-editor/ce-page-proxy.ui:76
+msgid "URL from where the PAC script is to be obtained."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "從檔案匯入隊伍組態(_I)…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-proxy.ui:101
+#, fuzzy
+msgid "Method"
+msgstr "方法(_M)："
+
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 msgid "ARP (IPv4)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 msgid "NDP (IPv6)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:6
-#: ../src/connection-editor/ce-page-team.ui.h:37
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
-msgid "_Queue ID:"
+#: src/connection-editor/ce-page-team-port.ui:225
+msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 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
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
-#, fuzzy
-msgid "_Port priority:"
-msgstr "優先順序(_P)："
-
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
-msgid "Port _sticky"
+#: src/connection-editor/ce-page-team-port.ui:255
+msgid "Active-Backup runner options"
 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:271
+#, fuzzy
+msgid "_Port priority"
+msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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
+#: src/connection-editor/ce-page-team-port.ui:286
 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"
+#: src/connection-editor/ce-page-team-port.ui:297
+msgid "Port _sticky"
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:301
+msgid "Do not unselect the port if a better one becomes available."
+msgstr ""
+
+#: src/connection-editor/ce-page-team-port.ui:316
+msgid "LACP runner options"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
-msgid "_LACP port priority:"
+msgid "_LACP port priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
-msgid "LACP port _key:"
+msgid "LACP port _key"
 msgstr "私密密碼匙(_K)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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
+#: src/connection-editor/ce-page-team-port.ui:361
 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
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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
+#: src/connection-editor/ce-page-team-port.ui:376
 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:"
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
+msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
-msgid "_Up delay:"
+msgid "_Up delay"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
-msgid "_Down delay:"
+msgid "_Down delay"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
-msgid "Send _interval:"
+msgid "Send _interval"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
-msgid "Delay _before first send:"
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
+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:"
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
+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:506
+#: src/connection-editor/ce-page-team.ui:1232
+#, fuzzy
+msgid "_Source host"
+msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
-msgid "_Target host:"
+msgid "_Target host"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 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
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 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
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 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
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
+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:587
+#: src/connection-editor/ce-page-team.ui:1313
 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
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 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
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 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
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 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
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 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
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 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
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 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
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "從檔案匯入隊伍組態(_I)…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
-msgid "Edit _JSON configuration:"
+msgid "Edit _JSON configuration"
 msgstr "_JSON 設定:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "羣組頻寬："
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "優先順序"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
-msgid "_Teamed connections:"
+#: src/connection-editor/ce-page-team.ui:174
+#, fuzzy
+msgid "_Teamed connections"
 msgstr "隊伍連線(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 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
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "有線網絡"
 
-#: ../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
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 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
+#: src/connection-editor/ce-page-team.ui:500
 #, fuzzy
 msgid "IP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
-msgid "_Peer notification count:"
+#: src/connection-editor/ce-page-team.ui:603
+msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
-msgid "Peer _notification interval:"
+#: src/connection-editor/ce-page-team.ui:618
+msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
-msgid "_Multicast rejoin count:"
+#: src/connection-editor/ce-page-team.ui:633
+msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
-msgid "Multicast _rejoin interval:"
+#: src/connection-editor/ce-page-team.ui:648
+msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
-msgid "_Hardware Address:"
+msgid "_Hardware Address"
 msgstr "硬件位址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 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:"
+#: src/connection-editor/ce-page-team.ui:798
+msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
-msgid "_Hardware address policy:"
+msgid "_Hardware address policy"
 msgstr "硬件位址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 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
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
-msgid "_System priority:"
+msgid "_System priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
-msgid "_Minimum ports:"
+#: src/connection-editor/ce-page-team.ui:918
+msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
-msgid "_Aggregator selection policy:"
+#: src/connection-editor/ce-page-team.ui:933
+msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 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
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 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
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
-msgid "Transmission _balancing interval:"
+msgid "Transmission _balancing interval"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
-msgid "_Transmission balancer:"
+msgid "_Transmission balancer"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
-msgid "_Parent interface:"
+#: src/connection-editor/ce-page-vlan.ui:28
+#, fuzzy
+msgid "_Parent interface"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
-msgid "VLAN inter_face name:"
+msgid "VLAN inter_face name"
 msgstr "VLAN 介面名稱(_N)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
-msgid "Cloned MAC _address:"
+msgid "Cloned MAC _address"
 msgstr "複製的 MA_C 位址："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
-msgid "VLAN _id:"
+#: src/connection-editor/ce-page-vlan.ui:140
+#, fuzzy
+msgid "VLAN _id"
 msgstr "VLAN _id："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
-msgid "Flags:"
+#: src/connection-editor/ce-page-vlan.ui:197
+msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr ""
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
-msgid "S_ecurity:"
+#: src/connection-editor/ce-page-wifi-security.ui:29
+#, fuzzy
+msgid "S_ecurity"
 msgstr "安全性(_E)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
-msgid "Transmission po_wer:"
+#: src/connection-editor/ce-page-wifi.ui:222
+#, fuzzy
+msgid "Transmission po_wer"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
-msgid "_Rate:"
+#: src/connection-editor/ce-page-wifi.ui:275
+#, fuzzy
+msgid "_Rate"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
-msgid "_BSSID:"
+#: src/connection-editor/ce-page-wifi.ui:311
+#, fuzzy
+msgid "_BSSID"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
-msgid "C_hannel:"
+#: src/connection-editor/ce-page-wifi.ui:336
+#, fuzzy
+msgid "C_hannel"
 msgstr "頻道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
-msgid "Ban_d:"
+#: src/connection-editor/ce-page-wifi.ui:368
+#, fuzzy
+msgid "Ban_d"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
-msgid "SS_ID:"
+#: src/connection-editor/ce-page-wifi.ui:414
+#, fuzzy
+msgid "SS_ID"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "允許的驗證方式"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "可延伸的驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "密碼驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定第 2 版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -2743,434 +3108,473 @@ msgstr ""
 "在大多數情況下，網絡供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
 "嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-wifi.c:440 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bluetooth.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-dsl.c:127
-msgid "DSL"
-msgstr "DSL"
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
+msgid "DSL/PPPoE"
+msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-infiniband.c:148
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "繫結"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "隊伍"
 
-#: ../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
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-ip-tunnel.c:176
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/connection-helpers.c:396
-#: ../src/connection-editor/page-vpn.c:96
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
+msgid "MACsec"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../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."
+#: src/connection-editor/connection-helpers.c:204
+msgid "No VPN service type."
 msgstr ""
-"VPN 外掛程式無法正確的匯入 VPN 連線\n"
-"\n"
-"錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/connection-helpers.c:217
-msgid "Cannot import VPN connection"
-msgstr "無法匯入 VPN 網絡連線"
-
-#: ../src/connection-editor/connection-helpers.c:219
-#, fuzzy, c-format
-msgid ""
-"The file “%s” could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+#: src/connection-editor/connection-helpers.c:209
+#, fuzzy
+msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
-"檔案「%s」無法讀取或未包含可辨識的 VPN 連線資訊\n"
+"VPN 外掛程式無法正確的匯入 VPN 連線\n"
 "\n"
-"錯誤：%s。"
-
-#: ../src/connection-editor/connection-helpers.c:220
-#, fuzzy
-msgid "unknown error"
-msgstr "不明的錯誤"
+"錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/connection-helpers.c:303
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: ../src/connection-editor/connection-helpers.c:338
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
+msgid "_Open"
+msgstr ""
+
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../src/connection-editor/connection-helpers.c:365
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "虛擬"
 
-#: ../src/connection-editor/connection-helpers.c:514
-#: ../src/connection-editor/connection-helpers.c:516
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "匯入已儲存的 VPN 組態…"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
 
-#: ../src/connection-editor/connection-helpers.c:555
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "無法建立新連線"
 
-#: ../src/connection-editor/connection-helpers.c:718
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "刪除連線失敗"
 
-#: ../src/connection-editor/connection-helpers.c:766
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "你確定要刪除連線 %s ？"
 
-#: ../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
+#: src/connection-editor/gtk/menus.ui:6
+#, fuzzy
+msgid "_New Connection"
+msgstr "_VPN 連線"
+
+#: src/connection-editor/gtk/menus.ui:13
+msgid "_Quit"
+msgstr ""
+
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "地址"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1155
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "網絡遮罩"
 
-#: ../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
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "度量 (Metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1114
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:112
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "編輯未命名的連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:132
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.c:352
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:359
-#: ../src/connection-editor/nm-connection-list.c:408
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.c:374
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:450
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/connection-editor/nm-connection-editor.c:577
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:578
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:579
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:595
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:597
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:738
+#: src/connection-editor/nm-connection-editor.c:742
 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:758
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:1142
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
-msgid "_Close"
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Connection _name:"
+#: src/connection-editor/nm-connection-editor.ui:110
+#, fuzzy
+msgid "Connection _name"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "匯出(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:12
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:13
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:127
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "永不"
 
-#: ../src/connection-editor/nm-connection-list.c:138
-#: ../src/connection-editor/nm-connection-list.c:149
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "現在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:156
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../src/connection-editor/nm-connection-list.c:160
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../src/connection-editor/nm-connection-list.c:172
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:178
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:182
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:473
+#, fuzzy
+msgid "Connection cannot be deleted"
+msgstr "新增連線失敗"
+
+#: src/connection-editor/nm-connection-list.c:476
+#, fuzzy
+msgid "Select a connection to edit"
+msgstr "隊伍連線 %d"
+
+#: src/connection-editor/nm-connection-list.c:478
+#, fuzzy
+msgid "Select a connection to delete"
+msgstr "隊伍連線 %d"
+
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:648
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:696
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:697
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "驗證以編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:712
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:713
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:935
-#: ../src/connection-editor/nm-connection-list.c:938
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
+msgid "Unrecognized connection type"
+msgstr "不支援的流動寬頻連線類型。"
+
+#: src/connection-editor/nm-connection-list.c:1064
+#, fuzzy, c-format
+msgid "Don’t know how to import “%s” connections"
+msgstr "不知道如何建立「%s」連線"
+
+#: src/connection-editor/nm-connection-list.c:1068
+#, fuzzy
+msgid "Error importing connection"
+msgstr "編輯連線時發生錯誤"
+
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "建立連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: src/connection-editor/nm-connection-list.c:1075
+#, fuzzy
+msgid "Connection type not specified."
+msgstr "新增連線失敗"
+
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:970
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:971
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "找不到 UUID「%s」的連線"
 
-#: ../src/connection-editor/page-8021x-security.c:109
+#: src/connection-editor/nm-connection-list.ui:7
+msgid "Network Connections"
+msgstr "網絡連線"
+
+#: src/connection-editor/nm-connection-list.ui:86
+#, fuzzy
+msgid "Add a new connection"
+msgstr "_VPN 連線"
+
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X 防護"
 
-#: ../src/connection-editor/page-8021x-security.c:111
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "無法載入 802.1X 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:125
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:125
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-bluetooth.c:175
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "找不到藍牙裝置。"
 
-#: ../src/connection-editor/page-bluetooth.c:258
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bluetooth.c:308
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "藍牙"
 
-#: ../src/connection-editor/page-bluetooth.c:326
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:331
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/page-bluetooth.c:336
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi 網絡"
 
-#: ../src/connection-editor/page-bond.c:449
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:568
+#: src/connection-editor/page-bond.c:565
 #, fuzzy
 msgid "primary"
 msgstr "主要(_P):"
 
-#: ../src/connection-editor/page-bond.c:623
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:317
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -3178,32 +3582,37 @@ msgstr "橋接的連線 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:108
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "橋接連接埠"
 
-#: ../src/connection-editor/page-bridge-port.c:110
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "無法載入橋接連接埠使用者介面。"
 
-#: ../src/connection-editor/page-dcb.c:622
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:129
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "無法載入 DSL 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:320
+#, fuzzy
+msgid "missing parent interface"
+msgstr "父介面(_P)："
+
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3213,44 +3622,43 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "已忽略"
 
-#: ../src/connection-editor/page-ethernet.c:353
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網絡使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:515
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/page-ethernet.c:519
-#: ../src/connection-editor/page-vlan.c:742
-#: ../src/connection-editor/page-wifi.c:574
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "複製的 MAC 位址(_L)："
 
-#: ../src/connection-editor/page-ethernet.c:523
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:563
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "線網絡連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:54
-#: ../src/libnma/nma-mobile-providers.c:817
-#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:55
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3259,11 +3667,11 @@ msgstr ""
 "定義連線信任等級的地帶。預設值不是正常的地帶，選擇它會直接使用防火牆中預設的"
 "地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3274,273 +3682,273 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:151
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:214
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:178
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip-tunnel.c:292
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "線網絡連線 %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:130
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:131
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "只用自動 (VPN) 位址"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "只用自動 (PPPoE) 位址"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:198
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../src/connection-editor/page-ip4.c:361
-#: ../src/connection-editor/page-ip6.c:324
-msgid "Additional DNS ser_vers:"
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
+#, fuzzy
+msgid "Additional DNS ser_vers"
 msgstr "額外的 _DNS 伺服器："
 
-#: ../src/connection-editor/page-ip4.c:370
-#: ../src/connection-editor/page-ip6.c:333
-msgid "Additional s_earch domains:"
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
+#, fuzzy
+msgid "Additional s_earch domains"
 msgstr "額外的搜尋網域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1226
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1228
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip4.c:1321
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1329
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1338
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1381
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:993
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1184
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1186
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
-#: ../src/connection-editor/page-ip6.c:1277
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1285
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1294
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1336
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:247
-#: ../src/connection-editor/page-master.c:258
+#: src/connection-editor/page-macsec.c:189
+#, fuzzy
+msgid "Could not load MACsec user interface."
+msgstr "無法載入 WiMAX 使用者介面。"
+
+#: src/connection-editor/page-macsec.c:328
+#, fuzzy, c-format
+msgid "MACSEC connection %d"
+msgstr "WiMAX 連線 %d"
+
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "重製從屬"
 
-#: ../src/connection-editor/page-master.c:248
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
 
-#: ../src/connection-editor/page-master.c:259
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr "從屬「%s」與「%s」套用到同個實體裝置不同的虛擬連接埠(「%s」與「%s」)。"
 
-#: ../src/connection-editor/page-master.c:385
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:310
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入流動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:327
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的流動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇流動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:567
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr "請選擇你的無線寬頻供應商所使用的技術。如果你不確定，請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:572
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的供應商使用 _GSM 為主的技術（例如 GPRS、EDGE、UMTS、HSDPA）"
 
 #. 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
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
 
-#: ../src/connection-editor/page-mobile.c:589 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:283
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:592 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:281
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:129
-msgid "EAP"
-msgstr "EAP"
-
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:322
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:290
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:275
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "編輯 %s 的 PPP 驗證方法"
 
-#: ../src/connection-editor/page-ppp.c:279
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:281
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-proxy.c:215
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr ""
 
-#: ../src/connection-editor/page-proxy.c:217
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "錯誤：檔案不含有效的 JSON 組態"
 
-#: ../src/connection-editor/page-team.c:1156
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "無法載入隊伍使用者介面。"
 
-#: ../src/connection-editor/page-team.c:1253
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "隊伍連線 %d"
@@ -3548,69 +3956,69 @@ msgstr "隊伍連線 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:732
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "隊伍連接埠"
 
-#: ../src/connection-editor/page-team-port.c:734
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:415
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (經由「%s」)"
 
-#: ../src/connection-editor/page-vlan.c:427
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "沒有網絡連接"
 
-#: ../src/connection-editor/page-vlan.c:596
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:735
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:803
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:98
-msgid "Could not load VPN user interface."
-msgstr "無法載入 VPN 使用者介面。"
-
-#: ../src/connection-editor/page-vpn.c:113
-#, fuzzy, c-format
-msgid "Could not find VPN plugin for “%s”."
-msgstr "找不到「%s」的 VPN 外掛程式服務。"
-
-#: ../src/connection-editor/page-vpn.c:122
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "找不到「%s」的 VPN 外掛程式服務。"
 
-#: ../src/connection-editor/page-vpn.c:123
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "連線失敗"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:102
+msgid "Could not load VPN user interface."
+msgstr "無法載入 VPN 使用者介面。"
+
+#: src/connection-editor/page-vpn.c:117
+#, fuzzy, c-format
+msgid "Could not find VPN plugin for “%s”."
+msgstr "找不到「%s」的 VPN 外掛程式服務。"
+
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:211
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "請選擇 VPN 的連線類型"
 
-#: ../src/connection-editor/page-vpn.c:212
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -3620,7 +4028,7 @@ msgstr ""
 "選擇你想要用在新連線中的 VPN 類型。如果你想要建立的 VPN 連線類型沒有出現在清"
 "單中，可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -3629,7 +4037,7 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點（AP）。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3639,94 +4047,92 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:442
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:564
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:570
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "任何裝置"
 
-#: ../src/connection-editor/page-wifi.c:617
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:356
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 密碼匙 (Hex 或 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:366
-#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "動態 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:405
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: ../src/connection-editor/page-wifi-security.c:418
-#: ../src/libnma/nma-wifi-dialog.c:990 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../src/connection-editor/page-wifi-security.c:461
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。"
 
-#: ../src/connection-editor/page-wifi-security.c:472
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:474
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wifi-security.c:558
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:564
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "你是否要以準備儲存的 VPN 連線取代 %s？"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "不能匯出 VPN 連線"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -3737,474 +4143,457 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "匯出 VPN 連線…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "自動解鎖這個裝置"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "連線資訊"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "啟用網絡連線"
+#: src/info.ui:30
+msgid "_Close"
+msgstr ""
+
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:140
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 證書(_R)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:164
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:364
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:368
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
-msgid "%s private _key:"
+msgid "%s private _key"
 msgstr "私密密碼匙(_K)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:372
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
-msgid "%s key _password:"
+msgid "%s key _password"
 msgstr "私密密碼匙密碼(_P)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:380
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
-msgid "%s _certificate:"
+msgid "%s _certificate"
 msgstr "使用者證書(_U)："
 
-#: ../src/libnma/nma-mobile-wizard.c:198
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
-msgid ""
-"Your mobile broadband connection is configured with the following settings:"
-msgstr "行動寬連線已經配置了以下設定："
-
-#. Device
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
-msgid "Your Device:"
-msgstr "你的裝置："
-
-#. Provider
-#: ../src/libnma/nma-mobile-wizard.c:216
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
-msgid "Your Provider:"
-msgstr "你的供應商："
-
-#. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:227
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
-msgid "Your Plan:"
-msgstr "你的計劃："
-
-#: ../src/libnma/nma-mobile-wizard.c:248
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
-#, fuzzy
-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."
-msgstr ""
-"現在，根據你所選取的設定，電腦將連上你的流動寬頻供應商。如果連線失敗，或是你"
-"無法存取網絡資源，請檢查設定。要修改流動寬頻連線的設定，請從「系統」 >> 「偏"
-"好設定」中，選擇「網絡連線」。"
-
-#: ../src/libnma/nma-mobile-wizard.c:261
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
-msgid "Confirm Mobile Broadband Settings"
-msgstr "確認流動寬頻設定"
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
+msgid "My country is not listed"
+msgstr "我的國家並沒有列出來"
 
-#: ../src/libnma/nma-mobile-wizard.c:325
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnma/nma-mobile-wizard.c:456
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
-msgid "_Select your plan:"
-msgstr "選擇你的計劃(_S)："
-
-#: ../src/libnma/nma-mobile-wizard.c:480
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
-msgid "Selected plan _APN (Access Point Name):"
-msgstr "選擇計劃的 _APN（Access Point Name，存取點名稱）："
-
-#: ../src/libnma/nma-mobile-wizard.c:500
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
-#, fuzzy
-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."
-msgstr ""
-"警告：選擇不正確的計劃可能會引起寬頻帳號的收費爭議，或讓你無法連線。\n"
-"\n"
-"如果你不確定所使用的計劃，請洽詢供應商，以得知計劃的 APN 為何。"
-
-#: ../src/libnma/nma-mobile-wizard.c:508
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
-msgid "Choose your Billing Plan"
-msgstr "選擇你的計費計劃"
-
-#: ../src/libnma/nma-mobile-wizard.c:557
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "我的計劃沒有列出…"
 
-#: ../src/libnma/nma-mobile-wizard.c:710
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
-msgid "Select your provider from a _list:"
-msgstr "請從清單裏選擇供應商(_L)："
-
-#: ../src/libnma/nma-mobile-wizard.c:723
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnma/nma-mobile-wizard.c:748
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
-#, fuzzy
-msgid "I can’t find my provider and I wish to enter it _manually:"
-msgstr "我找不到我的供應商，我想要手動輸入(_M)："
-
-#: ../src/libnma/nma-mobile-wizard.c:761
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
-msgid "Provider:"
-msgstr "供應商："
-
-#: ../src/libnma/nma-mobile-wizard.c:778
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
-msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
-msgstr "我的供應商使用 GSM 技術（GPRS、EDGE、UMTS、HSPA）"
-
-#: ../src/libnma/nma-mobile-wizard.c:780
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
-msgid "My provider uses CDMA technology (1xRTT, EVDO)"
-msgstr "我的供應商使用 CDMA 技術（1xRTT、EVDO）"
-
-#: ../src/libnma/nma-mobile-wizard.c:791
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
-msgid "Choose your Provider"
-msgstr "選擇你的供應商"
-
-#: ../src/libnma/nma-mobile-wizard.c:1053
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "國家或地區清單："
-
-#: ../src/libnma/nma-mobile-wizard.c:1066
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "國家或地區"
-
-#: ../src/libnma/nma-mobile-wizard.c:1076
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
-msgid "My country is not listed"
-msgstr "我的國家並沒有列出來"
-
-#: ../src/libnma/nma-mobile-wizard.c:1126
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
-#, fuzzy
-msgid "Choose your Provider’s Country or Region"
-msgstr "選擇你的供應商的國家或地區"
-
-#: ../src/libnma/nma-mobile-wizard.c:1183
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnma/nma-mobile-wizard.c:1186
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnma/nma-mobile-wizard.c:1354
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr "任何裝置"
+
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr "新的流動寬頻連線"
+
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "這能幫助你輕易地設定流動寬頻連線，連至手機 (3G) 網絡。"
 
-#: ../src/libnma/nma-mobile-wizard.c:1360
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "你需要以下資訊："
 
-#: ../src/libnma/nma-mobile-wizard.c:1371
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnma/nma-mobile-wizard.c:1377
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費計劃的名稱"
 
-#: ../src/libnma/nma-mobile-wizard.c:1383
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "（在有些情況下）你的寬頻計費計劃的 APN（存取點名稱）"
 
-#: ../src/libnma/nma-mobile-wizard.c:1412
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "為這個流動寬頻裝置建立連線(_T)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1427
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
-msgid "Any device"
-msgstr "任何裝置"
-
-#: ../src/libnma/nma-mobile-wizard.c:1440
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定流動寬頻連線"
 
-#: ../src/libnma/nma-mobile-wizard.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
-msgid "New Mobile Broadband Connection"
-msgstr "新的流動寬頻連線"
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "國家或地區"
 
-#: ../src/libnma/nma-cert-chooser-button.c:162
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
+#, fuzzy
+msgid "Choose your Provider’s Country or Region"
+msgstr "選擇你的供應商的國家或地區"
+
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
+msgid "Select your provider from a _list:"
+msgstr "請從清單裏選擇供應商(_L)："
+
+#: src/libnma/nma-mobile-wizard.ui:289
+#, fuzzy
+msgid "I can’t find my provider and I wish to set up the connection _manually:"
+msgstr "我找不到我的供應商，我想要手動輸入(_M)："
+
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
+msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
+msgstr "我的供應商使用 GSM 技術（GPRS、EDGE、UMTS、HSPA）"
+
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
+msgid "My provider uses CDMA technology (1xRTT, EVDO)"
+msgstr "我的供應商使用 CDMA 技術（1xRTT、EVDO）"
+
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
+msgid "Choose your Provider"
+msgstr "選擇你的供應商"
+
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr "選擇你的計劃(_S)："
+
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
+msgid "Selected plan _APN (Access Point Name):"
+msgstr "選擇計劃的 _APN（Access Point Name，存取點名稱）："
+
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
+#, fuzzy
+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."
+msgstr ""
+"警告：選擇不正確的計劃可能會引起寬頻帳號的收費爭議，或讓你無法連線。\n"
+"\n"
+"如果你不確定所使用的計劃，請洽詢供應商，以得知計劃的 APN 為何。"
+
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
+msgid "Choose your Billing Plan"
+msgstr "選擇你的計費計劃"
+
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr "行動寬連線已經配置了以下設定："
+
+#. Device
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr "你的裝置："
+
+#. Provider
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr "你的供應商："
+
+#. Plan and APN
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr "你的計劃："
+
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
+#, fuzzy
+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."
+msgstr ""
+"現在，根據你所選取的設定，電腦將連上你的流動寬頻供應商。如果連線失敗，或是你"
+"無法存取網絡資源，請檢查設定。要修改流動寬頻連線的設定，請從「系統」 >> 「偏"
+"好設定」中，選擇「網絡連線」。"
+
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr "確認流動寬頻設定"
+
+#: src/libnma/nma-cert-chooser-button.c:167
 #, fuzzy
 msgid "(None)"
 msgstr "(無)"
 
-#: ../src/libnma/nma-cert-chooser-button.c:170
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:171
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A 證書："
 
-#: ../src/libnma/nma-cert-chooser-button.c:190
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 #, fuzzy
 msgid "(Unknown)"
 msgstr "不明"
 
-#: ../src/libnma/nma-cert-chooser-button.c:212
-#: ../src/libnma/nma-cert-chooser-button.c:242
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:213
-#: ../src/libnma/nma-cert-chooser-button.c:243
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr ""
 
-#: ../src/libnma/nma-cert-chooser-button.c:469
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:376
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:384
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
-msgid "%s certificate _password:"
+msgid "%s certificate _password"
 msgstr "使用者證書(_U)："
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "解鎖(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr ""
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr ""
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "只儲存這個使用者的密碼(_U)"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "儲存所有使用者的密碼(_A)"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 #, fuzzy
 msgid "Ask for this password every time"
 msgstr "每次都詢問密碼(_K)"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:99
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
-msgid "_Secondary Password:"
-msgstr "第二密碼(_S)："
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
+msgid "Sh_ow passwords"
+msgstr "顯示密碼(_O)"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "第二密碼(_S)："
 
-#: ../src/libnma/nma-vpn-password-dialog.c:247
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
-msgid "Sh_ow passwords"
-msgstr "顯示密碼(_O)"
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S)："
 
-#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "斷線"
 
-#: ../src/libnma/nma-wifi-dialog.c:133 ../src/libnm-gtk/nm-wifi-dialog.c:142
-msgid ""
-"Either a password is missing or the connection is invalid. In the latter "
-"case, you have to edit the connection with nm-connection-editor first"
-msgstr ""
-
-#: ../src/libnma/nma-wifi-dialog.c:468 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr ""
 
-#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 #, fuzzy
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP (802.1X)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1074 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網絡"
 
-#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網絡"
 
-#: ../src/libnma/nma-wifi-dialog.c:1172 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網絡"
 
-#: ../src/libnma/nma-wifi-dialog.c:1176 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網絡"
 
-#: ../src/libnma/nma-wifi-dialog.c:1177 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
 
-#: ../src/libnma/wifi.ui.h:1 ../src/libnm-gtk/wifi.ui.h:1
-msgid "Wi-Fi _security:"
+#: src/libnma/wifi.ui:97
+#, fuzzy
+msgid "Wi-Fi _security"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
-msgid "C_onnection:"
+#: src/libnma/wifi.ui:154
+#, fuzzy
+msgid "C_onnection"
 msgstr "連線(_N)："
 
-#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
-msgid "Wi-Fi _adapter:"
+#: src/libnma/wifi.ui:179
+#, fuzzy
+msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi 介面卡(_A)："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:749
+#, fuzzy
+msgid "I can’t find my provider and I wish to enter it _manually:"
+msgstr "我找不到我的供應商，我想要手動輸入(_M)："
+
+#: src/libnm-gtk/nm-mobile-wizard.c:762
+msgid "Provider:"
+msgstr "供應商："
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "國家或地區清單："
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "國家或地區"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "有線"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4214,17 +4603,39 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/main.c:42
+#: src/libnm-gtk/nm-wifi-dialog.c:142
+msgid ""
+"Either a password is missing or the connection is invalid. In the latter "
+"case, you have to edit the connection with nm-connection-editor first"
+msgstr ""
+
+#: src/libnm-gtk/wifi.ui:97
+msgid "Wi-Fi _security:"
+msgstr "Wi-Fi 安全性(_S)："
+
+#: src/libnm-gtk/wifi.ui:129
+msgid "_Network name:"
+msgstr "網絡名稱(_N)："
+
+#: src/libnm-gtk/wifi.ui:154
+msgid "C_onnection:"
+msgstr "連線(_N)："
+
+#: src/libnm-gtk/wifi.ui:179
+msgid "Wi-Fi _adapter:"
+msgstr "Wi-Fi 介面卡(_A)："
+
+#: src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4232,418 +4643,484 @@ msgstr ""
 "本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的"
 "元件"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "用來在 GNOME 桌面環境下運行，而不是使用命令列。"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未啟用"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未註冊"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家用網絡（%s）"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "家用網絡"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "搜尋中"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "註冊被拒"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s 漫遊)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s（漫遊）"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫遊網絡（%s）"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "漫遊網絡"
 
-#: ../src/mobile-helpers.c:331
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
 
-#: ../src/mobile-helpers.c:464
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:472
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "這個流動寬頻裝置需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:622
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "流動寬頻連線「%s」在使用中：(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:625
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "漫遊"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s 連線"
 
-#: ../src/utils/utils.c:563
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:575
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER、PEM 或是 PKCS#12 私人密碼匙 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:227
-msgid "no file selected"
-msgstr ""
-
-#: ../src/wireless-security/eap-method.c:235
-#, c-format
-msgid "file “%s” does not exist"
-msgstr ""
+#: src/wireless-security/eap-method.c:365
+#, fuzzy
+msgid "no CA certificate selected"
+msgstr "不需要 CA 證書(_R)"
 
-#: ../src/wireless-security/eap-method.c:258
-msgid "unspecified error validating eap-method file"
+#: src/wireless-security/eap-method.c:370
+msgid "selected CA certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:269
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:352
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "已驗證"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "兩者"
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
+#, fuzzy
+msgid "Anony_mous identity"
 msgstr "匿名識別(_M)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
-msgid "PAC _file:"
+#: src/wireless-security/eap-method-fast.ui:74
+#, fuzzy
+msgid "PAC _file"
 msgstr "PAC 檔案(_F)："
 
-#: ../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:"
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
+#, fuzzy
+msgid "_Inner authentication"
 msgstr "內部驗證(_I)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
-#, c-format
-msgid "invalid EAP-PEAP CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:69
-msgid "invalid EAP-PEAP CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:337
-#: ../src/wireless-security/wireless-security.c:424
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-ttls.c:431
-#, fuzzy
-msgid "Choose a Certificate Authority certificate"
-msgstr "選擇證書授權單位 (CA) 證書…"
-
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "C_A certificate:"
-msgstr "C_A 證書："
-
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 證書(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "PEAP _version:"
+#: src/wireless-security/eap-method-peap.ui:89
+#, fuzzy
+msgid "PEAP _version"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
+msgid "Suffix of the server certificate name."
+msgstr ""
+
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
+msgid "_Domain"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:88
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-simple.c:120
+msgid "missing EAP client Private Key passphrase"
+msgstr ""
+
+#: src/wireless-security/eap-method-simple.ui:103
+#, fuzzy
+msgid "P_rivate Key Passphrase"
+msgstr "WEP 128-位元 密語"
+
+#: src/wireless-security/eap-method-simple.ui:128
+#, fuzzy
+msgid "Sh_ow passphrase"
+msgstr "顯示密碼(_O)"
+
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:238
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 證書(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:243
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:268
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:314
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
-msgid "no CA certificate selected"
-msgstr "不需要 CA 證書(_R)"
-
-#: ../src/wireless-security/eap-method-tls.c:319
-msgid "selected CA certificate file does not exist"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-msgid "I_dentity:"
+msgid "I_dentity"
 msgstr "識別(_D)："
 
-#: ../src/wireless-security/eap-method-ttls.c:64
-#, c-format
-msgid "invalid EAP-TTLS CA certificate: %s"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:69
-msgid "invalid EAP-TTLS CA certificate: no certificate specified"
-msgstr ""
-
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:436
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:460
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:471
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:482
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:493
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: ../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:"
+#: src/wireless-security/wireless-security.c:523
+msgid "Externally configured"
+msgstr ""
+
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
+#, fuzzy
+msgid "Au_thentication"
 msgstr "驗證(_E)："
 
-#: ../src/wireless-security/ws-leap.c:63
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:74
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:107
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:116
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:124
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:130
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:137
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.c:139
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (預設值)"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "開放系統"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享密碼匙"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "_Key:"
+#: src/wireless-security/ws-wep-key.ui:26
+msgid "1 (Default)"
+msgstr "1 (預設值)"
+
+#: src/wireless-security/ws-wep-key.ui:54
+#, fuzzy
+msgid "_Key"
 msgstr "密碼匙(_K)："
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "顯示密碼匙(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "WEP inde_x:"
+#: src/wireless-security/ws-wep-key.ui:129
+#, fuzzy
+msgid "WEP inde_x"
 msgstr "WEP 索引(_X)："
 
-#: ../src/wireless-security/ws-wpa-psk.c:70
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:79
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
+#: src/wireless-security/ws-wpa-psk.ui:48
+#, fuzzy
+msgid "_Type"
 msgstr "類型(_T)："
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (預設值)"
+
+#~ msgid "Ignored"
+#~ msgstr "已忽略"
+
+#~ msgid "Failed to update connection secrets due to an unknown error."
+#~ msgstr "由於不明的錯誤使連線機密的更新失敗。"
+
+#~ msgid "Priority:"
+#~ 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 "_Automatically connect to this network when it is available"
+#~ msgstr "當這個網絡可用時自動連線(_A)"
+
+#, fuzzy
+#~ msgid "Connection _priority for auto-activation:"
+#~ msgstr "連線資訊(_I)"
+
+#~ msgid "DSL"
+#~ msgstr "DSL"
+
+#~ msgid "Cannot import VPN connection"
+#~ msgstr "無法匯入 VPN 網絡連線"
+
+#, fuzzy
+#~ msgid ""
+#~ "The file “%s” could not be read or does not contain recognized VPN "
+#~ "connection information\n"
+#~ "\n"
+#~ "Error: %s."
+#~ msgstr ""
+#~ "檔案「%s」無法讀取或未包含可辨識的 VPN 連線資訊\n"
+#~ "\n"
+#~ "錯誤：%s。"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "不明的錯誤"
+
+#, fuzzy
+#~ msgid "Choose a Certificate Authority certificate"
+#~ msgstr "選擇證書授權單位 (CA) 證書…"
+
+#~ msgid "C_A certificate:"
+#~ msgstr "C_A 證書："
+
 #, fuzzy
 #~ msgid "NetworkManager for GNOME"
 #~ msgstr "NetworkManager 面板程式"
@@ -4677,30 +5154,6 @@ msgstr "類型(_T)："
 #~ 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"
 
@@ -4938,12 +5391,6 @@ msgstr "類型(_T)："
 #~ msgid "Automatic (PPP) addresses only"
 #~ msgstr "只用自動 (PPP) 位址"
 
-#~ msgid "Could not load WiMAX user interface."
-#~ msgstr "無法載入 WiMAX 使用者介面。"
-
-#~ msgid "WiMAX connection %d"
-#~ msgstr "WiMAX 連線 %d"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
 #~ "%s)."
@@ -4963,9 +5410,6 @@ msgstr "類型(_T)："
 #~ msgid "Error: %s"
 #~ msgstr "錯誤：%s"
 
-#~ msgid "Failed to create DUN connection: %s"
-#~ msgstr "無法建立 DUN 連線：%s"
-
 #~ msgid "Your phone is now ready to use!"
 #~ msgstr "你的電話現在已經可以使用！"
 
@@ -5004,15 +5448,6 @@ msgstr "類型(_T)："
 #~ msgid "%s Network"
 #~ msgstr "%s 網絡"
 
-#~ msgid "Primary DNS:"
-#~ msgstr "主要 DNS："
-
-#~ msgid "Secondary DNS:"
-#~ msgstr "次要 DNS："
-
-#~ msgid "Ternary DNS:"
-#~ msgstr "第三 DNS："
-
 #~ msgid "_Save..."
 #~ msgstr "儲存(_S)…"
 
@@ -5033,21 +5468,12 @@ msgstr "類型(_T)："
 #~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路 (可能被竊取、"
 #~ "劫聽之意)。是否要選擇一個憑證中心的憑證？"
 
-#~ msgid "Yes"
-#~ msgstr "是"
-
 #~ msgid "Only on activation"
 #~ msgstr "只在生效時"
 
-#~ msgid "No"
-#~ msgstr "否"
-
 #~ msgid "ModemManager is not running"
 #~ msgstr "ModemManager 未有運行"
 
-#~ msgid "Connect _automatically"
-#~ msgstr "自動連線(_A)"
-
 #~ msgid "A_vailable to all users"
 #~ msgstr "所有使用者皆可用"
 
@@ -5094,9 +5520,6 @@ msgstr "類型(_T)："
 #~ msgid "Wireless connection %d"
 #~ msgstr "無線網路連線 %d"
 
-#~ msgid "_Import"
-#~ msgstr "匯入(_I)"
-
 #~ msgid "Could not edit imported connection"
 #~ msgstr "無法編輯匯入的連線"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 90a138b9..c88aae65 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,129 +12,140 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 18:18+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-"
+"applet/\n"
+"POT-Creation-Date: 2019-05-29 10:49+0200\n"
 "PO-Revision-Date: 2017-11-07 06:45+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Traditional Chinese <zh-l10n@lists.linux.org.tw>\n"
-"Language: zh_Hant\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.3.2\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3198
+#: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737
+#: src/libnma/nma-bar-code-widget.c:144
 msgid "Network"
 msgstr "網路"
 
-#: ../nm-applet.desktop.in.h:2
+#: nm-applet.desktop.in:4
 msgid "Manage your network connections"
 msgstr "管理您的網路連線"
 
-#: ../nm-connection-editor.desktop.in.h:1
+#: nm-applet.desktop.in:5
+msgid "nm-device-wireless"
+msgstr ""
+
+#: nm-connection-editor.desktop.in:3
 #, fuzzy
 msgid "Advanced Network Configuration"
 msgstr "啟用網路連線"
 
-#: ../nm-connection-editor.desktop.in.h:2
+#: nm-connection-editor.desktop.in:4
 msgid "Manage and change your network connection settings"
 msgstr "管理與變更您的連線設定值"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+#: nm-connection-editor.desktop.in:5
+msgid "preferences-system-network"
+msgstr ""
+
+#: org.gnome.nm-applet.gschema.xml.in:6
 msgid "Disable connected notifications"
 msgstr "停止已連線的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#: org.gnome.nm-applet.gschema.xml.in:7
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "將這設為 True，以停用網路連線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+#: org.gnome.nm-applet.gschema.xml.in:11
 msgid "Disable disconnected notifications"
 msgstr "停止已離線的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#: org.gnome.nm-applet.gschema.xml.in:12
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr "將這設為 True，以停用網路離線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#: org.gnome.nm-applet.gschema.xml.in:16
 msgid "Disable VPN notifications"
 msgstr "停用 VPN 的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#: org.gnome.nm-applet.gschema.xml.in:17
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr "將這設為 True，以停用 VPN 線或離線時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#: org.gnome.nm-applet.gschema.xml.in:21
 msgid "Suppress networks available notifications"
 msgstr "停止可用網路的通知"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#: org.gnome.nm-applet.gschema.xml.in:22
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "將這設為 True，以停用有 Wi-Fi 無線網路可用時的通知。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+#: org.gnome.nm-applet.gschema.xml.in:26
 msgid "Stamp"
 msgstr "戳記"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+#: org.gnome.nm-applet.gschema.xml.in:27
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "用來決定設定是不是要轉移到新版本上。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:11
-msgid "Disable Wi-Fi Create"
+#: org.gnome.nm-applet.gschema.xml.in:31
+#, fuzzy
+msgid "Disable WiFi Create"
 msgstr "禁止建立 Wi-Fi"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#: org.gnome.nm-applet.gschema.xml.in:32
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr "將這設為 True，以停用使用面板程式建立 Ad hoc 網路。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+#: org.gnome.nm-applet.gschema.xml.in:36
 msgid "Show the applet in notification area"
 msgstr "在通知區域顯示面板程式"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: org.gnome.nm-applet.gschema.xml.in:37
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr "設定為 FALSE 來停用在通知區域示顯示面板程式的功能。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: org.gnome.nm-applet.gschema.xml.in:43 org.gnome.nm-applet.gschema.xml.in:48
 msgid "Ignore CA certificate"
 msgstr "忽略 CA 憑證"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+#: org.gnome.nm-applet.gschema.xml.in:44
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+#: org.gnome.nm-applet.gschema.xml.in:49
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
 # Tag: title
-#: ../nm-connection-editor.appdata.xml.in.h:1
+#: nm-connection-editor.appdata.xml.in:7
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
-#: ../nm-connection-editor.appdata.xml.in.h:2
+#: nm-connection-editor.appdata.xml.in:8
 #, fuzzy
 msgid "NetworkManager connection editor"
 msgstr "沒有網路連接"
 
-#: ../nm-connection-editor.appdata.xml.in.h:3
+#: nm-connection-editor.appdata.xml.in:11
 msgid ""
 "NetworkManager is a system service for managing and configuring your network "
 "connections and devices."
 msgstr "NetworkManager是一種用於管理和配置網絡連接和設備的系統服務。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:4
+#: nm-connection-editor.appdata.xml.in:13
 msgid ""
 "The nm-connection-editor program works with NetworkManager to create and "
 "edit existing connection profiles for NetworkManager."
@@ -142,121 +153,120 @@ msgstr ""
 "nm-connection-editor程序與NetworkManager一起使用，以創建和編輯NetworkManager"
 "的現有連接配置文件。"
 
-#: ../nm-connection-editor.appdata.xml.in.h:5
+#: nm-connection-editor.appdata.xml.in:27
 #, fuzzy
 msgid "The NetworkManager Developers"
 msgstr "NetworkManager 面板程式"
 
-#: ../shared/nm-utils/nm-shared-utils.c:794
+#: shared/nm-utils/nm-shared-utils.c:794
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "對像類'%s'沒有名字'%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:801
+#: shared/nm-utils/nm-shared-utils.c:801
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "物業'%s'對像類'%s'不可寫"
 
-#: ../shared/nm-utils/nm-shared-utils.c:808
+#: shared/nm-utils/nm-shared-utils.c:808
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "建築物“%s“對象”%s'施工後無法設置"
 
-#: ../shared/nm-utils/nm-shared-utils.c:816
+#: shared/nm-utils/nm-shared-utils.c:816
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "“%s::%s'不是有效的財產名稱; “%s'不是GObject子類型"
 
-#: ../shared/nm-utils/nm-shared-utils.c:825
+#: shared/nm-utils/nm-shared-utils.c:825
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "無法設置屬性'%s'類型'%s'來自類型的價值'%s“"
 
-#: ../shared/nm-utils/nm-shared-utils.c:836
+#: shared/nm-utils/nm-shared-utils.c:836
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
 "type '%s'"
 msgstr "價值“%s“類型'%s'無效或超出財產範圍'%s'類型'%s“"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#: src/8021x.ui:11 src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 驗證"
 
-#: ../src/8021x.ui.h:2 ../src/applet-device-ethernet.c:349
-#: ../src/applet-dialogs.c:1059 ../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:1
-#: ../src/connection-editor/ce-page-dcb.ui.h:17
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:759
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-#: ../src/connection-editor/page-bluetooth.c:307
-#: ../src/connection-editor/page-mobile.c:540
-#: ../src/connection-editor/page-proxy.c:121
-#: ../src/connection-editor/page-team.c:344
-#: ../src/connection-editor/page-team-port.c:206
-#: ../src/connection-editor/vpn-helpers.c:212 ../src/gsm-unlock.ui.h:1
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:1
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:1
-#: ../src/libnma/nma-wifi-dialog.c:1104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:209
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1067 ../src/mobile-helpers.c:465
+#: src/8021x.ui:31 src/applet-device-ethernet.c:349 src/applet-dialogs.c:1194
+#: src/connection-editor/ce-ip4-routes.ui:30
+#: src/connection-editor/ce-ip6-routes.ui:30
+#: src/connection-editor/ce-new-connection.ui:50
+#: src/connection-editor/ce-page-dcb.ui:569
+#: src/connection-editor/ce-page-dcb.ui:1019
+#: src/connection-editor/ce-ppp-auth-methods.ui:28
+#: src/connection-editor/connection-helpers.c:296
+#: src/connection-editor/connection-helpers.c:759
+#: src/connection-editor/nm-connection-editor.ui:197
+#: src/connection-editor/page-bluetooth.c:307
+#: src/connection-editor/page-mobile.c:540
+#: src/connection-editor/page-proxy.c:121 src/connection-editor/page-team.c:344
+#: src/connection-editor/page-team-port.c:206
+#: src/connection-editor/vpn-helpers.c:212 src/gsm-unlock.ui:28
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:19
+#: src/libnma/nma-vpn-password-dialog.ui:23 src/libnma/nma-wifi-dialog.c:1104
+#: src/libnm-gtk/nm-vpn-password-dialog.c:209
+#: src/libnm-gtk/nm-wifi-dialog.c:1067 src/mobile-helpers.c:465
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: ../src/8021x.ui.h:3 ../src/libnma/nma-wifi-dialog.c:1110
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1073
+#: src/8021x.ui:46 src/libnma/nma-wifi-dialog.c:1110
+#: src/libnm-gtk/nm-wifi-dialog.c:1073
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:2
+#: src/8021x.ui:122 src/libnma/wifi.ui:129
 #, fuzzy
 msgid "_Network name"
 msgstr "網路名稱(_N)："
 
-#: ../src/ap-menu-item.c:82
+#: src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:87
+#: src/ap-menu-item.c:87
 msgid "secure."
 msgstr "安全。"
 
-#: ../src/applet.c:392
+#: src/applet.c:392
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:394 ../src/applet.c:448 ../src/applet.c:483
-#: ../src/applet-device-wifi.c:1388 ../src/applet-device-wifi.c:1411
+#: src/applet.c:394 src/applet.c:448 src/applet.c:483
+#: src/applet-device-wifi.c:1388 src/applet-device-wifi.c:1411
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:397 ../src/applet.c:486 ../src/applet-device-wifi.c:539
-#: ../src/applet-device-wifi.c:1391 ../src/applet-device-wifi.c:1414
+#: src/applet.c:397 src/applet.c:486 src/applet-device-wifi.c:539
+#: src/applet-device-wifi.c:1391 src/applet-device-wifi.c:1414
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:446
+#: src/applet.c:446
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:451
+#: src/applet.c:451
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:481
+#: src/applet.c:481
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:808 ../src/applet-device-wifi.c:1127
+#: src/applet.c:808 src/applet-device-wifi.c:1127
 #, fuzzy
 msgid "Don’t show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:898
+#: src/applet.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -266,7 +276,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網路連線中斷了。"
 
-#: ../src/applet.c:900
+#: src/applet.c:900
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -276,7 +286,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網路連線被中斷了。"
 
-#: ../src/applet.c:902
+#: src/applet.c:902
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -285,7 +295,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:904
+#: src/applet.c:904
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -295,7 +305,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:906
+#: src/applet.c:906
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -304,7 +314,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:908
+#: src/applet.c:908
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -313,7 +323,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:910
+#: src/applet.c:910
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -322,7 +332,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:912
+#: src/applet.c:912
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -331,7 +341,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:914
+#: src/applet.c:914
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -340,7 +350,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為無效的 VPN 機密。"
 
-#: ../src/applet.c:919
+#: src/applet.c:919
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -349,7 +359,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:946
+#: src/applet.c:946
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -359,19 +369,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:948
+#: src/applet.c:948
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:950
+#: src/applet.c:950
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:958 ../src/applet.c:998
+#: src/applet.c:958 src/applet.c:998
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:1002
+#: src/applet.c:1002
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -384,7 +394,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: src/applet.c:1005
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -397,569 +407,581 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1296
+#: src/applet.c:1296
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1298
+#: src/applet.c:1298
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1308 ../src/applet-device-ethernet.c:109
+#: src/applet.c:1308 src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1324
+#: src/applet.c:1324
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1338
+#: src/applet.c:1338
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1411
+#: src/applet.c:1411
 msgid "No network devices available"
 msgstr "沒有可用的網路裝置"
 
-#: ../src/applet.c:1465
+#: src/applet.c:1463
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1509
+#: src/applet.c:1507
 #, fuzzy
 msgid "_Configure VPN…"
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1512
+#: src/applet.c:1510
 #, fuzzy
 msgid "_Add a VPN connection…"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1618
+#: src/applet.c:1616
 #, fuzzy
 msgid "NetworkManager is not running…"
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1623 ../src/applet.c:2688
+#: src/applet.c:1621 src/applet.c:2686
 msgid "Networking disabled"
 msgstr "網路已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1833
+#: src/applet.c:1831
 msgid "Enable _Networking"
 msgstr "啟用網路(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1842
+#: src/applet.c:1840
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1851
+#: src/applet.c:1849
 msgid "Enable _Mobile Broadband"
 msgstr "啟用行動寬頻(_M)"
 
 #. Toggle notifications item
-#: ../src/applet.c:1863
+#: src/applet.c:1861
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1875
+#: src/applet.c:1873
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1883
+#: src/applet.c:1881
 #, fuzzy
 msgid "Edit Connections…"
 msgstr "編輯連線…"
 
-#: ../src/applet.c:1897
+#: src/applet.c:1895
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2208
+#: src/applet.c:2206
 #, fuzzy, c-format
 msgid "You are now connected to “%s”."
 msgstr "您現在已連線至「%s」。"
 
-#: ../src/applet.c:2248
+#: src/applet.c:2246
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2249
+#: src/applet.c:2247
 msgid "The network connection has been disconnected."
 msgstr "網路連線已中斷。"
 
-#: ../src/applet.c:2551
+#: src/applet.c:2549
 #, fuzzy, c-format
 msgid "Preparing network connection “%s”…"
 msgstr "正在準備網路連線「%s」…"
 
-#: ../src/applet.c:2554
+#: src/applet.c:2552
 #, fuzzy, c-format
 msgid "User authentication required for network connection “%s”…"
 msgstr "網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2557 ../src/applet-device-bt.c:125
-#: ../src/mobile-helpers.c:607
+#: src/applet.c:2555 src/applet-device-bt.c:125 src/mobile-helpers.c:607
 #, fuzzy, c-format
 msgid "Requesting a network address for “%s”…"
 msgstr "正在要求提供「%s」的網路位址…"
 
-#: ../src/applet.c:2560
+#: src/applet.c:2558
 #, fuzzy, c-format
 msgid "Network connection “%s” active"
 msgstr "網路連線「%s」在使用中"
 
-#: ../src/applet.c:2633
+#: src/applet.c:2631
 #, fuzzy, c-format
 msgid "Starting VPN connection “%s”…"
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2636
+#: src/applet.c:2634
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection “%s”…"
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2639
+#: src/applet.c:2637
 #, fuzzy, c-format
 msgid "Requesting a VPN address for “%s”…"
 msgstr "正在要求 VPN 提供「%s」的網路位址…"
 
-#: ../src/applet.c:2642
-#, fuzzy, c-format
+#: src/applet.c:2640
+#, fuzzy
 msgid "VPN connection active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2692
+#: src/applet.c:2690
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../src/applet.c:3299
+#: src/applet.c:3297
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-broadband.c:161
+#: src/applet-device-broadband.c:161
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK 碼錯誤，請聯絡您的供應商。"
 
-#: ../src/applet-device-broadband.c:203
+#: src/applet-device-broadband.c:203
 msgid "Wrong PIN code; please contact your provider."
 msgstr "PIN 碼錯誤，請聯絡您的供應商。"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:254
+#: src/applet-device-broadband.c:254
 #, fuzzy
 msgid "Sending unlock code…"
 msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-broadband.c:739 ../src/applet-dialogs.c:507
+#: src/applet-device-broadband.c:739 src/applet-dialogs.c:533
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "行動寬頻 (%s)"
 
-#: ../src/applet-device-broadband.c:741
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/libnm-gtk/nm-ui-utils.c:329
+#: src/applet-device-broadband.c:741
+#: src/connection-editor/connection-helpers.c:108
+#: src/connection-editor/page-mobile.c:305 src/libnm-gtk/nm-ui-utils.c:329
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
-#: ../src/applet-device-broadband.c:794 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:907
+#: src/applet-device-broadband.c:794 src/applet-device-bt.c:75
+#: src/applet-device-ethernet.c:117 src/applet-device-wifi.c:907
 msgid "Available"
 msgstr "可用"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:807
+#: src/applet-device-broadband.c:807
 #, fuzzy
 msgid "New Mobile Broadband connection…"
 msgstr "新的行動寬頻連線"
 
-#: ../src/applet-device-broadband.c:821 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1309
+#: src/applet-device-broadband.c:821 src/applet-device-bt.c:87
+#: src/applet-device-ethernet.c:132 src/applet-device-wifi.c:1309
 msgid "Connection Established"
 msgstr "已建立連線"
 
-#: ../src/applet-device-broadband.c:822
+#: src/applet-device-broadband.c:822
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:962 ../src/applet-device-broadband.c:968
+#: src/applet-device-broadband.c:962 src/applet-device-broadband.c:968
 msgid "Mobile Broadband network."
 msgstr "行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:963
+#: src/applet-device-broadband.c:963
 msgid "You are now registered on the home network."
 msgstr "您現在已註冊至家用網路。"
 
-#: ../src/applet-device-broadband.c:969
+#: src/applet-device-broadband.c:969
 msgid "You are now registered on a roaming network."
 msgstr "您現在已註冊至漫遊網路。"
 
-#: ../src/applet-device-bt.c:88
+#: src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:598
+#: src/applet-device-bt.c:116 src/mobile-helpers.c:598
 #, fuzzy, c-format
 msgid "Preparing mobile broadband connection “%s”…"
 msgstr "正在準備行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:601
+#: src/applet-device-bt.c:119 src/mobile-helpers.c:601
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection “%s”…"
 msgstr "正在設定行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:604
+#: src/applet-device-bt.c:122 src/mobile-helpers.c:604
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection “%s”…"
 msgstr "行動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:626
+#: src/applet-device-bt.c:129 src/mobile-helpers.c:626
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active"
 msgstr "行動寬頻連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:30
+#: src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動乙太網路"
 
-#: ../src/applet-device-ethernet.c:82
+#: src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:84
+#: src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:87
+#: src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:89
+#: src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:133
+#: src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "您現在已連線至有線網路。"
 
-#: ../src/applet-device-ethernet.c:161
+#: src/applet-device-ethernet.c:161
 #, fuzzy, c-format
 msgid "Preparing ethernet network connection “%s”…"
 msgstr "正在準備有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:164
+#: src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection “%s”…"
 msgstr "正在設定有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:167
+#: src/applet-device-ethernet.c:167
 #, fuzzy, c-format
 msgid "User authentication required for ethernet network connection “%s”…"
 msgstr "有線網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:170
+#: src/applet-device-ethernet.c:170
 #, fuzzy, c-format
 msgid "Requesting an ethernet network address for “%s”…"
 msgstr "正要求有線網路「%s」提供網路位址…"
 
-#: ../src/applet-device-ethernet.c:174
+#: src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection “%s” active"
 msgstr "有線網路連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:346
+#: src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#: ../src/applet-device-ethernet.c:350 ../src/applet-dialogs.c:1060
-#: ../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:18
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#: ../src/connection-editor/page-bluetooth.c:309
-#: ../src/connection-editor/page-mobile.c:542
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:2
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:210 ../src/mobile-helpers.c:466
+#: src/applet-device-ethernet.c:350 src/applet-dialogs.c:1195
+#: src/connection-editor/ce-ip4-routes.ui:44
+#: src/connection-editor/ce-ip6-routes.ui:44
+#: src/connection-editor/ce-page-dcb.ui:583
+#: src/connection-editor/ce-page-dcb.ui:1033
+#: src/connection-editor/ce-ppp-auth-methods.ui:42
+#: src/connection-editor/page-bluetooth.c:309
+#: src/connection-editor/page-mobile.c:542
+#: src/libnma/nma-vpn-password-dialog.ui:39
+#: src/libnm-gtk/nm-vpn-password-dialog.c:210 src/mobile-helpers.c:466
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../src/applet-device-wifi.c:225
+#: src/applet-device-wifi.c:225
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network…"
 msgstr "連接到隱藏的 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:276
+#: src/applet-device-wifi.c:276
 #, fuzzy
 msgid "Create _New Wi-Fi Network…"
 msgstr "建立新的 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:358
+#: src/applet-device-wifi.c:358
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:536 ../src/applet-device-wifi.c:1409
+#: src/applet-device-wifi.c:536 src/applet-device-wifi.c:1409
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wifi.c:537
+#: src/applet-device-wifi.c:537
 msgid "Insufficient privileges."
 msgstr "權限不足。"
 
-#: ../src/applet-device-wifi.c:839
+#: src/applet-device-wifi.c:839
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:841
+#: src/applet-device-wifi.c:841
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:843
+#: src/applet-device-wifi.c:843
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:872
+#: src/applet-device-wifi.c:872
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:873
+#: src/applet-device-wifi.c:873
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬體開關停用"
 
-#: ../src/applet-device-wifi.c:934
+#: src/applet-device-wifi.c:934
 msgid "More networks"
 msgstr "更多網路"
 
-#: ../src/applet-device-wifi.c:1123
+#: src/applet-device-wifi.c:1123
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網路可用"
 
-#: ../src/applet-device-wifi.c:1124
+#: src/applet-device-wifi.c:1124
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網路選單來連線到 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:1308
+#: src/applet-device-wifi.c:1308
 #, fuzzy, c-format
 msgid "You are now connected to the Wi-Fi network “%s”."
 msgstr "您現在已連線至 Wi-Fi 網路「%s」。"
 
-#: ../src/applet-device-wifi.c:1343
+#: src/applet-device-wifi.c:1343
 #, fuzzy, c-format
 msgid "Preparing Wi-Fi network connection “%s”…"
 msgstr "正在準備 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1346
+#: src/applet-device-wifi.c:1346
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection “%s”…"
 msgstr "正在設定 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1349
+#: src/applet-device-wifi.c:1349
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network “%s”…"
 msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1352
+#: src/applet-device-wifi.c:1352
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for “%s”…"
 msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…"
 
-#: ../src/applet-device-wifi.c:1363
+#: src/applet-device-wifi.c:1363
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active: %s (%d%%)"
 msgstr "Wi-Fi 網路連線「%s」在使用中： %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1367
+#: src/applet-device-wifi.c:1367
 #, fuzzy, c-format
 msgid "Wi-Fi network connection “%s” active"
 msgstr "Wi-Fi 網路連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1386
+#: src/applet-device-wifi.c:1386
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-dialogs.c:41
+#: src/applet-dialogs.c:42
 msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../src/applet-dialogs.c:73 ../src/connection-editor/page-wifi-security.c:378
-#: ../src/libnma/nma-wifi-dialog.c:972 ../src/libnm-gtk/nm-wifi-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:449
+#: src/applet-dialogs.c:74 src/connection-editor/page-wifi-security.c:378
+#: src/libnma/nma-wifi-dialog.c:972 src/libnm-gtk/nm-wifi-dialog.c:948
+#: src/wireless-security/wireless-security.c:449
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:75
+#: src/applet-dialogs.c:76
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:77 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: src/applet-dialogs.c:78 src/applet-dialogs.c:240 src/applet-dialogs.c:242
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:152
+#: src/applet-dialogs.c:177
 #, fuzzy
 msgid "More addresses"
 msgstr "地址"
 
-#: ../src/applet-dialogs.c:227
+#: src/applet-dialogs.c:238
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235 ../src/applet-dialogs.c:244
-#: ../src/connection-editor/page-wifi-security.c:329
+#: src/applet-dialogs.c:246 src/applet-dialogs.c:255
+#: src/connection-editor/page-wifi-security.c:329
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:261
-#, c-format
-msgid "%s (default)"
-msgstr "%s (預設值)"
-
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:581
+#: src/applet-dialogs.c:325 src/applet-dialogs.c:598
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: src/applet-dialogs.c:327 src/applet-dialogs.c:600
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
 #. Address
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:369
+#: src/applet-dialogs.c:342 src/applet-dialogs.c:364
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:421
+#: src/applet-dialogs.c:343 src/applet-dialogs.c:416
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../src/applet-dialogs.c:370
+#: src/applet-dialogs.c:365
 msgid "Broadcast Address"
 msgstr "廣播位址"
 
 #. Prefix
-#: ../src/applet-dialogs.c:382
+#: src/applet-dialogs.c:377
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:383
+#: src/applet-dialogs.c:378
 msgid "Subnet Mask"
 msgstr "子網路遮罩"
 
-#: ../src/applet-dialogs.c:493
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Primary DNS"
+msgstr "主要(_P):"
+
+#: src/applet-dialogs.c:440
+#, fuzzy
+msgid "Secondary DNS"
+msgstr "第二密碼(_S)："
+
+#: src/applet-dialogs.c:440
+msgid "Tertiary DNS"
+msgstr ""
+
+#: src/applet-dialogs.c:519
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網路 (%s)"
 
-#: ../src/applet-dialogs.c:496
+#: src/applet-dialogs.c:522
 #, c-format
 msgid "802.11 Wi-Fi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:503
+#: src/applet-dialogs.c:529
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: src/applet-dialogs.c:531
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:513 ../src/applet-dialogs.c:811
-#: ../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
+#: src/applet-dialogs.c:539 src/applet-dialogs.c:874
+#: src/connection-editor/ce-page-team-port.ui:394
+#: src/connection-editor/ce-page-team.ui:775
+#: src/connection-editor/page-general.c:367
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:517
+#: src/applet-dialogs.c:542
 msgid "Interface"
 msgstr "介面"
 
-#: ../src/applet-dialogs.c:537
+#: src/applet-dialogs.c:557
 msgid "Hardware Address"
 msgstr "硬體位址"
 
 #. Driver
-#: ../src/applet-dialogs.c:551
+#: src/applet-dialogs.c:570
 msgid "Driver"
 msgstr "驅動程式"
 
-#: ../src/applet-dialogs.c:586
+#: src/applet-dialogs.c:603
 msgid "Speed"
 msgstr "速度"
 
-#: ../src/applet-dialogs.c:601
-msgid "Security:"
+#: src/applet-dialogs.c:616
+#, fuzzy
+msgid "Security"
 msgstr "安全性："
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:619 ../src/applet-dialogs.c:852
-#: ../src/connection-editor/ce-page-team.ui.h:29
+#: src/applet-dialogs.c:641 src/applet-dialogs.c:904
+#: src/connection-editor/ce-page-team.ui:492
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:690
+#: src/applet-dialogs.c:660 src/applet-dialogs.c:709
 msgid "Default Route"
 msgstr "預設路由"
 
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:874
-#: ../src/connection-editor/ce-page-team.ui.h:30
+#: src/applet-dialogs.c:688 src/applet-dialogs.c:931
+#: src/connection-editor/ce-page-team.ui:496
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:883
-msgid "Ignored"
-msgstr "已忽略"
+#: src/applet-dialogs.c:730 src/connection-editor/ce-page-wifi.ui:52
+msgid "Hotspot"
+msgstr "熱點"
+
+#: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161
+#, fuzzy
+msgid "Password"
+msgstr "密碼："
 
-#: ../src/applet-dialogs.c:816
+#: src/applet-dialogs.c:878
 msgid "VPN Type"
 msgstr "VPN 類型"
 
-#: ../src/applet-dialogs.c:823
+#: src/applet-dialogs.c:883
 msgid "VPN Gateway"
 msgstr "VPN 閘道器"
 
-#: ../src/applet-dialogs.c:829
+#: src/applet-dialogs.c:887
 msgid "VPN Username"
 msgstr "VPN 使用者名稱"
 
-#: ../src/applet-dialogs.c:835
+#: src/applet-dialogs.c:891
 msgid "VPN Banner"
 msgstr "VPN 旗幟"
 
-#: ../src/applet-dialogs.c:841
+#: src/applet-dialogs.c:895
 msgid "Base Connection"
 msgstr "基礎連線"
 
-#: ../src/applet-dialogs.c:843 ../src/libnm-gtk/nm-ui-utils.c:343
+#: src/applet-dialogs.c:896 src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:958
+#: src/applet-dialogs.c:1093
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線！"
 
-#: ../src/applet-dialogs.c:1007
+#: src/applet-dialogs.c:1142
 msgid ""
 "Copyright © 2004-2017 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -968,54 +990,54 @@ msgstr ""
 "版權所有©2004-2017 Red Hat，Inc。版權所有©2005-2008 Novell，Inc。和許多其他社"
 "區貢獻者和翻譯"
 
-#: ../src/applet-dialogs.c:1010
+#: src/applet-dialogs.c:1145
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理您的網路裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:1012
+#: src/applet-dialogs.c:1147
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:1016
+#: src/applet-dialogs.c:1151
 msgid "translator-credits"
 msgstr ""
 "莊佳儒 <tchuang@redhat.com>.\n"
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2017."
 
-#: ../src/applet-dialogs.c:1026
+#: src/applet-dialogs.c:1161
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/applet-dialogs.c:1031
+#: src/applet-dialogs.c:1166
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:1057
+#: src/applet-dialogs.c:1192
 msgid "Mobile broadband network password"
 msgstr "行動寬頻網路密碼"
 
-#: ../src/applet-dialogs.c:1066
+#: src/applet-dialogs.c:1201
 #, fuzzy, c-format
 msgid "A password is required to connect to “%s”."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1081
+#: src/applet-dialogs.c:1216
 msgid "Password:"
 msgstr "密碼："
 
-#: ../src/applet-dialogs.c:1363
+#: src/applet-dialogs.c:1498
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1364
+#: src/applet-dialogs.c:1499
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1366
+#: src/applet-dialogs.c:1501
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PIN code before it can be "
@@ -1023,25 +1045,25 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1368
+#: src/applet-dialogs.c:1503
 msgid "PIN code:"
 msgstr "PIN 碼："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1372
+#: src/applet-dialogs.c:1507
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1374
+#: src/applet-dialogs.c:1509
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1375
+#: src/applet-dialogs.c:1510
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1377
+#: src/applet-dialogs.c:1512
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device “%s” requires a SIM PUK code before it can be "
@@ -1049,98 +1071,98 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1379
+#: src/applet-dialogs.c:1514
 msgid "PUK code:"
 msgstr "PUK 碼："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1382
+#: src/applet-dialogs.c:1517
 msgid "New PIN code:"
 msgstr "新的 PIN 碼："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1384
+#: src/applet-dialogs.c:1519
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1389
+#: src/applet-dialogs.c:1524
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
-#: ../src/applet-vpn-request.c:201
+#: src/applet-vpn-request.c:408
 #, fuzzy
 msgid "Connection had no VPN setting"
 msgstr "連線資訊"
 
-#: ../src/applet-vpn-request.c:251
+#: src/applet-vpn-request.c:458
 #, fuzzy, c-format
 msgid "Failed to write connection to VPN UI: %s (%d)"
 msgstr "無法使用連線"
 
-#: ../src/applet-vpn-request.c:259
+#: src/applet-vpn-request.c:466
 msgid "Failed to write connection to VPN UI: incomplete write"
 msgstr "無法寫入與VPN UI的連接：寫入不完整"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#: ../src/connection-editor/ce-page.h:112
+#: src/connection-editor/ce-ip4-routes.ui:92
+#: src/connection-editor/ce-ip6-routes.ui:92
+#: src/connection-editor/ce-page.h:112
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network. Click the “Add” button "
 "to add an IP address."
 msgstr "用來在網路上區別您的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../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:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:13
-#: ../src/connection-editor/nm-connection-list.ui.h:3
+#: src/connection-editor/ce-ip4-routes.ui:113
+#: src/connection-editor/ce-ip6-routes.ui:113
+#: src/connection-editor/ce-page-bond.ui:180
+#: src/connection-editor/ce-page-bridge.ui:120
+#: src/connection-editor/ce-page-ip4.ui:150
+#: src/connection-editor/ce-page-ip6.ui:181
+#: src/connection-editor/ce-page-team.ui:233
+#: src/connection-editor/nm-connection-list.ui:87
 msgid "_Add"
 msgstr "新增(_A)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:5
-#: ../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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#: ../src/connection-editor/ce-page-team.ui.h:15
-#: ../src/connection-editor/connection-helpers.c:760
-#: ../src/connection-editor/nm-connection-list.ui.h:4
+#: src/connection-editor/ce-ip4-routes.ui:128
+#: src/connection-editor/ce-ip6-routes.ui:128
+#: src/connection-editor/ce-page-bond.ui:208
+#: src/connection-editor/ce-page-bridge.ui:148
+#: src/connection-editor/ce-page-ip4.ui:165
+#: src/connection-editor/ce-page-ip6.ui:196
+#: src/connection-editor/ce-page-team.ui:261
+#: src/connection-editor/connection-helpers.c:760
+#: src/connection-editor/nm-connection-list.ui:101
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:6
-#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#: src/connection-editor/ce-ip4-routes.ui:157
+#: src/connection-editor/ce-ip6-routes.ui:157
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自動獲得的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:7
-#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#: src/connection-editor/ce-ip4-routes.ui:172
+#: src/connection-editor/ce-ip6-routes.ui:172
 msgid "_Use this connection only for resources on its network"
 msgstr "只在使用這個連線的網路資源時，才使用此連線(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:8
-#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+#: src/connection-editor/ce-ip4-routes.ui:177
+#: src/connection-editor/ce-ip6-routes.ui:177
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如果啟用，這個連線將永遠不會做為預設網路連線。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: src/connection-editor/ce-new-connection.ui:65
 #, fuzzy
 msgid "C_reate…"
 msgstr "建立…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: src/connection-editor/ce-new-connection.ui:120
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: src/connection-editor/ce-new-connection.ui:137
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1152,185 +1174,198 @@ msgstr ""
 "如果要建立 VPN，而您想要建立的 VPN 連線類型沒有出現在清單中，可能是沒有安裝正"
 "確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:21
+#: src/connection-editor/ce-page-bluetooth.ui:35
+#: src/connection-editor/ce-page-ethernet.ui:129
+#: src/connection-editor/ce-page-infiniband.ui:50
+#: src/connection-editor/ce-page-wifi.ui:139
+#, fuzzy
+msgid "_Device"
+msgstr "服務(_S)："
+
+#: src/connection-editor/ce-page-bond.ui:24
+#: src/connection-editor/ce-page-team.ui:433
 msgid "Round-robin"
 msgstr "循環分配 (Round-robin)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:27
+#: src/connection-editor/ce-page-team.ui:437
 msgid "Active backup"
 msgstr "自動備援 (Active-backup)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
+#: src/connection-editor/ce-page-bond.ui:30
 msgid "XOR"
 msgstr "XOR"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:33
+#: src/connection-editor/ce-page-team.ui:429
 msgid "Broadcast"
 msgstr "廣播"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:36
 msgid "802.3ad"
 msgstr "802.3ad"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
+#: src/connection-editor/ce-page-bond.ui:39
 msgid "Adaptive transmit load balancing"
 msgstr "適應性傳輸負載平衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
+#: src/connection-editor/ce-page-bond.ui:42
 msgid "Adaptive load balancing"
 msgstr "適應性負載平衡"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
+#: src/connection-editor/ce-page-bond.ui:53
 msgid "MII (recommended)"
 msgstr "MII (建議值)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
+#: src/connection-editor/ce-page-bond.ui:56
 msgid "ARP"
 msgstr "ARP"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
+#: src/connection-editor/ce-page-bond.ui:91
 #, fuzzy
 msgid "Bonded _connections"
 msgstr "繫結的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:105
+#: src/connection-editor/ce-page-wifi.ui:400
 #, fuzzy
 msgid "M_ode"
 msgstr "模式(_O)："
 
-#: ../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:14
-#: ../src/connection-editor/nm-connection-list.ui.h:5
+#: src/connection-editor/ce-page-bond.ui:194
+#: src/connection-editor/ce-page-bridge.ui:134
+#: src/connection-editor/ce-page-team.ui:247
+#: src/connection-editor/nm-connection-list.ui:115
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: src/connection-editor/ce-page-bond.ui:238
 #, fuzzy
 msgid "Monitoring _frequency"
 msgstr "監控頻率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: src/connection-editor/ce-page-bond.ui:272
+#: src/connection-editor/ce-page-bond.ui:422
+#: src/connection-editor/ce-page-bond.ui:462
 msgid "ms"
 msgstr "毫秒"
 
-#: ../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:16
+#: src/connection-editor/ce-page-bond.ui:291
+#: src/connection-editor/ce-page-bridge.ui:192
+#: src/connection-editor/ce-page-team.ui:292
 #, fuzzy
 msgid "_Interface name"
 msgstr "介面名稱(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: src/connection-editor/ce-page-bond.ui:316
 #, fuzzy
 msgid "_Link Monitoring"
 msgstr "連線監控(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: src/connection-editor/ce-page-bond.ui:347
 #, fuzzy
 msgid "ARP _targets"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: src/connection-editor/ce-page-bond.ui:361
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
 msgstr ""
 "一個 IP 位址，或以逗號分隔的 IP 位址清單，這是在檢查連線狀態時查詢用的。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: src/connection-editor/ce-page-bond.ui:373
 #, fuzzy
 msgid "Link _up delay"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: src/connection-editor/ce-page-bond.ui:387
 #, fuzzy
 msgid "Link _down delay"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: src/connection-editor/ce-page-bond.ui:481
 #, fuzzy
 msgid "_Primary"
 msgstr "主要(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:24
+#: src/connection-editor/ce-page-bond.ui:495
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
 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: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
+#: src/connection-editor/ce-page-bond.ui:507
+#: src/connection-editor/ce-page-ethernet.ui:188
+#: src/connection-editor/ce-page-infiniband.ui:134
+#: src/connection-editor/ce-page-team.ui:319
+#: src/connection-editor/ce-page-vlan.ui:87
+#: src/connection-editor/ce-page-wifi.ui:111
 #, fuzzy
 msgid "_MTU"
 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:7
-#: ../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
+#: src/connection-editor/ce-page-bond.ui:540
+#: src/connection-editor/ce-page-ethernet.ui:223
+#: src/connection-editor/ce-page-infiniband.ui:116
+#: src/connection-editor/ce-page-team.ui:355
+#: src/connection-editor/ce-page-vlan.ui:122
+#: src/connection-editor/ce-page-wifi.ui:92
 msgid "bytes"
 msgstr "位元組"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+#: src/connection-editor/ce-page-bridge-port.ui:42
 #, fuzzy
 msgid "Path _cost"
 msgstr "路徑成本(_C)："
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: src/connection-editor/ce-page-bridge-port.ui:55
+#: src/connection-editor/ce-page-bridge.ui:178
 #, fuzzy
 msgid "_Priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#: src/connection-editor/ce-page-bridge-port.ui:97
 #, fuzzy
 msgid "_Hairpin mode"
 msgstr "_Hairpin 模式："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#: src/connection-editor/ce-page-bridge.ui:62
 #, fuzzy
 msgid "Bridged _connections"
 msgstr "橋接的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: src/connection-editor/ce-page-bridge.ui:218
 #, fuzzy
 msgid "_Forward delay"
 msgstr "轉送延遲(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: src/connection-editor/ce-page-bridge.ui:232
 #, fuzzy
 msgid "_Hello time"
 msgstr "_Hello 時間："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: src/connection-editor/ce-page-bridge.ui:252
 msgid "STP forwarding delay, in seconds"
 msgstr "STP轉發延遲，以秒為單位"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: src/connection-editor/ce-page-bridge.ui:269
+#: src/connection-editor/ce-page-bridge.ui:311
+#: src/connection-editor/ce-page-bridge.ui:415
+#: src/connection-editor/ce-page-bridge.ui:471
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: src/connection-editor/ce-page-bridge.ui:294
 msgid "STP hello time, in seconds"
 msgstr "STP你好時間，以秒為單位"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: src/connection-editor/ce-page-bridge.ui:328
 #, fuzzy
 msgid "Enable I_GMP snooping"
 msgstr "啟用網路(_N)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:13
+#: src/connection-editor/ce-page-bridge.ui:332
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
@@ -1339,44 +1374,44 @@ msgstr ""
 "控制是否為此網橋啟用IGMP偵聽。請注意，如果由於哈希衝突而自動禁用了偵聽，則係"
 "統可能會拒絕啟用該功能，直到解決衝突為止。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:14
+#: src/connection-editor/ce-page-bridge.ui:344
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "啟用 _STP (生成樹協議)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:15
+#: src/connection-editor/ce-page-bridge.ui:348
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge"
 msgstr "控制是否為此網橋啟用生成樹協議（STP）"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:16
+#: src/connection-editor/ce-page-bridge.ui:363
 msgid ""
 "STP priority for this bridge. Lower values are “better”; the lowest priority "
 "bridge will be elected the root bridge."
 msgstr "這座橋的STP優先級。較低的值是“更好”;最低優先級的橋將被選為根橋。"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:17
+#: src/connection-editor/ce-page-bridge.ui:378
 #, fuzzy
 msgid "_Max age"
 msgstr "最大時間(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:18
+#: src/connection-editor/ce-page-bridge.ui:398
 msgid "STP maximum message age, in seconds"
 msgstr "STP最大消息時間，以秒為單位"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:19
+#: src/connection-editor/ce-page-bridge.ui:434
 #, fuzzy
 msgid "_Aging time"
 msgstr "存續時間(_A)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:20
+#: src/connection-editor/ce-page-bridge.ui:454
 msgid "The Ethernet MAC address aging time, in seconds"
 msgstr "以太網MAC地址老化時間，單位為秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:21
+#: src/connection-editor/ce-page-bridge.ui:490
 msgid "Group _forward mask"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:22
+#: src/connection-editor/ce-page-bridge.ui:504
 msgid ""
 "A mask of 16 bits, each corresponding to a group address in the range from "
 "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask "
@@ -1387,42 +1422,42 @@ msgstr ""
 "00：00：0F範圍內的組地址。掩碼不能設置位0,1或2，因為它們用於STP，MAC暫停幀和"
 "LACP。"
 
-#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112
+#: src/connection-editor/ce-page.c:78 src/connection-editor/ce-page.c:112
 msgid "automatic"
 msgstr "自動"
 
-#: ../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
-#: ../src/connection-editor/page-wifi.c:193
-#, c-format
+#: src/connection-editor/ce-page.c:86 src/connection-editor/ce-page.c:121
+#: src/connection-editor/ce-page-dcb.ui:419
+#: src/connection-editor/ce-page-dcb.ui:442
+#: src/connection-editor/ce-page-dcb.ui:465
+#: src/connection-editor/page-wifi.c:168 src/connection-editor/page-wifi.c:172
+#: src/connection-editor/page-wifi.c:193
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page.c:189
+#: src/connection-editor/ce-page.c:189
 msgid "unspecified error"
 msgstr "未指明的錯誤"
 
-#: ../src/connection-editor/ce-page.c:294
+#: src/connection-editor/ce-page.c:294
 msgid "Preserve"
 msgstr "保留"
 
-#: ../src/connection-editor/ce-page.c:295
+#: src/connection-editor/ce-page.c:295
 msgid "Permanent"
 msgstr "永久"
 
 # translation auto-copied from project virt-manager, version 0.10.0, document virt-manager, author ccheng
-#: ../src/connection-editor/ce-page.c:296
+#: src/connection-editor/ce-page.c:296
 msgid "Random"
 msgstr "隨機"
 
-#: ../src/connection-editor/ce-page.c:297
+#: src/connection-editor/ce-page.c:297
 #, fuzzy
 msgid "Stable"
 msgstr "啟用"
 
-#: ../src/connection-editor/ce-page.c:301
+#: src/connection-editor/ce-page.c:301
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1432,287 +1467,329 @@ msgstr ""
 "在這裡輸入的 MAC 位址會成為這個連線使用的網路裝置的硬體位址。這個功能也稱為 "
 "MAC 複製或偽裝。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 msgid "MAC address"
 msgstr "MAC 位址"
 
-#: ../src/connection-editor/ce-page.c:341
+#: src/connection-editor/ce-page.c:341
 #, fuzzy
 msgid "HW address"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.c:344
+#: src/connection-editor/ce-page.c:344
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "無效 %s 對於 %s （%s）"
 
-#: ../src/connection-editor/ce-page.c:348
+#: src/connection-editor/ce-page.c:348
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "無效 %s （%s）"
 
-#: ../src/connection-editor/ce-page.c:388
+#: src/connection-editor/ce-page.c:388
 #, c-format
 msgid "invalid interface-name for %s (%s): "
 msgstr "無效的接口名稱 %s （%s）： "
 
-#: ../src/connection-editor/ce-page.c:392
+#: src/connection-editor/ce-page.c:392
 #, fuzzy, c-format
 msgid "invalid interface-name (%s): "
 msgstr "VLAN 介面名稱(_N)："
 
-#: ../src/connection-editor/ce-page.c:571
+#: src/connection-editor/ce-page.c:571
 msgid "can’t parse device name"
 msgstr "無法解析設備名稱"
 
-#: ../src/connection-editor/ce-page.c:589
+#: src/connection-editor/ce-page.c:589
 #, fuzzy
 msgid "invalid hardware address"
 msgstr "硬體位址："
 
-#: ../src/connection-editor/ce-page.c:611
+#: src/connection-editor/ce-page.c:611
 #, c-format
 msgid "invalid %s (%s): "
 msgstr "無效 %s （%s）： "
 
-#: ../src/connection-editor/ce-page.c:612
-#: ../src/connection-editor/ce-page.c:617
+#: src/connection-editor/ce-page.c:612 src/connection-editor/ce-page.c:617
 #, fuzzy
 msgid "device"
 msgstr "任何裝置"
 
-#: ../src/connection-editor/ce-page.c:616
+#: src/connection-editor/ce-page.c:616
 #, c-format
 msgid "invalid %s (%s) "
 msgstr "無效 %s （%s） "
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#: src/connection-editor/ce-page-dcb.ui:16
 #, fuzzy
 msgid "_Use Data Center Bridging (DCB) for this connection"
 msgstr "在這個連線使用資料中心橋接 (DCB)"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:2
+#: src/connection-editor/ce-page-dcb.ui:49
 msgid "FCoE"
 msgstr "FCoE"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:3
+#: src/connection-editor/ce-page-dcb.ui:62
 msgid "iSCSI"
 msgstr "iSCSI"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#: src/connection-editor/ce-page-dcb.ui:75
 msgid "FIP"
 msgstr "FIP"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:5
+#: src/connection-editor/ce-page-dcb.ui:88
 msgid "Flow Control"
 msgstr "流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:6
+#: src/connection-editor/ce-page-dcb.ui:101
 msgid "Feature"
 msgstr "功能"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#: src/connection-editor/ce-page-dcb.ui:118
 msgid "Enable"
 msgstr "啟用"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:8
+#: src/connection-editor/ce-page-dcb.ui:135
 msgid "Advertise"
 msgstr "廣告"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:9
+#: src/connection-editor/ce-page-dcb.ui:152
 msgid "Willing"
 msgstr "意願"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#: src/connection-editor/ce-page-dcb.ui:168
+#: src/connection-editor/ce-page-dcb.ui:635
 msgid "Priority"
 msgstr "優先順序"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:11
+#: src/connection-editor/ce-page-dcb.ui:336
+#: src/connection-editor/ce-page-dcb.ui:401
 #, fuzzy
 msgid "Options…"
 msgstr "選項…"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#: src/connection-editor/ce-page-dcb.ui:352
 msgid "Priority Groups"
 msgstr "優先順序群組"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:14
+#: src/connection-editor/ce-page-dcb.ui:487
+#: src/connection-editor/ce-page-dcb.ui:535
 msgid "Fabric"
 msgstr "光纖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:15
+#: src/connection-editor/ce-page-dcb.ui:488
+#: src/connection-editor/ce-page-dcb.ui:539
 msgid "VN2VN"
 msgstr "VN2VN"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: src/connection-editor/ce-page-dcb.ui:546
+#: src/connection-editor/ce-page-dcb.ui:996
 msgid "Priority Flow Control"
 msgstr "優先順序流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:19
+#: src/connection-editor/ce-page-dcb.ui:613
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "依每個使用者優先順序啟用或停用優先順序暫停傳輸。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:20
+#: src/connection-editor/ce-page-dcb.ui:653
+#: src/connection-editor/ce-page-dcb.ui:1086
+#: src/connection-editor/ce-page-dcb.ui:1490
+#: src/connection-editor/ce-page-dcb.ui:1822
+#: src/connection-editor/ce-page-dcb.ui:2154
+#: src/connection-editor/ce-page-dcb.ui:2486
 #, fuzzy
 msgid "0"
 msgstr "0："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:21
+#: src/connection-editor/ce-page-dcb.ui:694
+#: src/connection-editor/ce-page-dcb.ui:1135
+#: src/connection-editor/ce-page-dcb.ui:1530
+#: src/connection-editor/ce-page-dcb.ui:1862
+#: src/connection-editor/ce-page-dcb.ui:2194
+#: src/connection-editor/ce-page-dcb.ui:2536
 #, fuzzy
 msgid "1"
 msgstr "1："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:22
+#: src/connection-editor/ce-page-dcb.ui:735
+#: src/connection-editor/ce-page-dcb.ui:1184
+#: src/connection-editor/ce-page-dcb.ui:1570
+#: src/connection-editor/ce-page-dcb.ui:1902
+#: src/connection-editor/ce-page-dcb.ui:2234
+#: src/connection-editor/ce-page-dcb.ui:2586
 #, fuzzy
 msgid "2"
 msgstr "2："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:23
+#: src/connection-editor/ce-page-dcb.ui:776
+#: src/connection-editor/ce-page-dcb.ui:1233
+#: src/connection-editor/ce-page-dcb.ui:1610
+#: src/connection-editor/ce-page-dcb.ui:1942
+#: src/connection-editor/ce-page-dcb.ui:2274
+#: src/connection-editor/ce-page-dcb.ui:2636
 #, fuzzy
 msgid "3"
 msgstr "3："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:24
+#: src/connection-editor/ce-page-dcb.ui:817
+#: src/connection-editor/ce-page-dcb.ui:1282
+#: src/connection-editor/ce-page-dcb.ui:1650
+#: src/connection-editor/ce-page-dcb.ui:1982
+#: src/connection-editor/ce-page-dcb.ui:2314
+#: src/connection-editor/ce-page-dcb.ui:2686
 #, fuzzy
 msgid "4"
 msgstr "4："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: src/connection-editor/ce-page-dcb.ui:858
+#: src/connection-editor/ce-page-dcb.ui:1331
+#: src/connection-editor/ce-page-dcb.ui:1690
+#: src/connection-editor/ce-page-dcb.ui:2022
+#: src/connection-editor/ce-page-dcb.ui:2354
+#: src/connection-editor/ce-page-dcb.ui:2736
 #, fuzzy
 msgid "5"
 msgstr "5："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: src/connection-editor/ce-page-dcb.ui:899
+#: src/connection-editor/ce-page-dcb.ui:1380
+#: src/connection-editor/ce-page-dcb.ui:1730
+#: src/connection-editor/ce-page-dcb.ui:2062
+#: src/connection-editor/ce-page-dcb.ui:2394
+#: src/connection-editor/ce-page-dcb.ui:2786
 #, fuzzy
 msgid "6"
 msgstr "6："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: src/connection-editor/ce-page-dcb.ui:940
+#: src/connection-editor/ce-page-dcb.ui:1429
+#: src/connection-editor/ce-page-dcb.ui:1770
+#: src/connection-editor/ce-page-dcb.ui:2102
+#: src/connection-editor/ce-page-dcb.ui:2434
+#: src/connection-editor/ce-page-dcb.ui:2836
 #, fuzzy
 msgid "7"
 msgstr "7："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: src/connection-editor/ce-page-dcb.ui:1069
 #, fuzzy
 msgid "Traffic Class"
 msgstr "流量類別："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: src/connection-editor/ce-page-dcb.ui:1473
 #, fuzzy
 msgid "Strict Bandwidth"
 msgstr "限制頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: src/connection-editor/ce-page-dcb.ui:1805
 #, fuzzy
 msgid "Priority Bandwidth"
 msgstr "優先順序頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: src/connection-editor/ce-page-dcb.ui:2137
 #, fuzzy
 msgid "Group Bandwidth"
 msgstr "群組頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: src/connection-editor/ce-page-dcb.ui:2469
 #, fuzzy
 msgid "Group ID"
 msgstr "群組 ID："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: src/connection-editor/ce-page-dcb.ui:2881
 msgid "Enter the priority group ID for each User Priority."
 msgstr "依每個使用者優先順序輸入優先順序群組 ID。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
-#, fuzzy, no-c-format
+#: src/connection-editor/ce-page-dcb.ui:2899
+#, fuzzy
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use. The "
 "sum of all groups must total 100%."
 msgstr ""
 "輸入每個優先順序群組可以使用的連線頻寬。所有群組的總合加起來必須為 100%。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: src/connection-editor/ce-page-dcb.ui:2917
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "輸入每個使用者優先順序可以使用的優先順序群組頻寬百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: src/connection-editor/ce-page-dcb.ui:2935
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "依每個使用者優先順序啟用或停用限制頻寬。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: src/connection-editor/ce-page-dcb.ui:2953
 msgid "Enter the traffic class for each user priority."
 msgstr "輸入每個使用者優先順序的流量類別。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-#: ../src/wireless-security/ws-leap.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:19
+#: src/connection-editor/ce-page-mobile.ui:62
+#: src/wireless-security/eap-method-leap.ui:21
+#: src/wireless-security/eap-method-simple.ui:21
+#: src/wireless-security/ws-leap.ui:21
 #, fuzzy
 msgid "_Username"
 msgstr "使用者名稱(_U)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: src/connection-editor/ce-page-dsl.ui:33
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "用於通過PPPoE服務進行身份驗證的用戶名。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:46
 msgid ""
 "Only initiate sessions with access concentrators that provide the specified "
 "service. For most providers this should be left blank."
 msgstr "僅啟動提供指定服務的訪問集中器的會話。對於大多數提供商，這應該留空。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: src/connection-editor/ce-page-dsl.ui:59
 #, fuzzy
 msgid "_Service"
 msgstr "服務(_S)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:5
-#: ../src/libnma/nma-file-cert-chooser.c:347
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:3
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#: src/connection-editor/ce-page-dsl.ui:71
+#: src/libnma/nma-file-cert-chooser.c:347
+#: src/wireless-security/eap-method-leap.ui:60
+#: src/wireless-security/eap-method-simple.ui:77
+#: src/wireless-security/ws-leap.ui:60 src/wireless-security/ws-wpa-psk.ui:60
 msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:6
+#: src/connection-editor/ce-page-dsl.ui:89
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "用於通過PPPoE服務進行身份驗證的密碼。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:7
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
+#: src/connection-editor/ce-page-dsl.ui:102
+#: src/connection-editor/ce-page-mobile.ui:76
+#: src/wireless-security/eap-method-leap.ui:35
+#: src/wireless-security/eap-method-simple.ui:35
+#: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20
 #, fuzzy
 msgid "_Password"
 msgstr "密碼(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:8
+#: src/connection-editor/ce-page-dsl.ui:116
 #, fuzzy
 msgid "PPP _interface"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:9
+#: src/connection-editor/ce-page-dsl.ui:130
 #, fuzzy
 msgid "P_arent interface"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:10
+#: src/connection-editor/ce-page-dsl.ui:144
 msgid "An arbitrary name to assign to the newly created PPP interface."
 msgstr "分配給新創建的PPP接口的任意名稱。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:11
+#: src/connection-editor/ce-page-dsl.ui:160
 msgid "The interface on which the PPP connection will be established."
 msgstr "將建立PPP連接的接口。"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:12
+#: src/connection-editor/ce-page-dsl.ui:171
 #, fuzzy
 msgid "C_laim interface"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:13
+#: src/connection-editor/ce-page-dsl.ui:175
 msgid ""
 "If selected, the connection will take exclusive control of the interface and "
 "it won’t be possible to activate another connection on it. Note that the "
@@ -1720,143 +1797,135 @@ msgid ""
 "activate the connection only if this option is selected."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:1
-#: ../src/connection-editor/ce-page-general.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:2
-#: ../src/connection-editor/ce-page-wifi.ui.h:1
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:143
-#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: src/connection-editor/ce-page-ethernet.ui:17
+#: src/connection-editor/ce-page-ethernet.ui:77
+#: src/connection-editor/ce-page-general.ui:26
+#: src/connection-editor/ce-page-ip4.ui:12
+#: src/connection-editor/ce-page-ip6.ui:12
+#: src/connection-editor/ce-page-proxy.ui:24
+#: src/connection-editor/ce-page-wifi.ui:32
+#: src/connection-editor/page-ip4.c:132 src/connection-editor/page-ip6.c:143
+#: src/wireless-security/eap-method-peap.ui:23
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+#: src/connection-editor/ce-page-ethernet.ui:20
 msgid "Twisted Pair (TP)"
 msgstr "雙絞線 (TP)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#: src/connection-editor/ce-page-ethernet.ui:23
 msgid "Attachment Unit Interface (AUI)"
 msgstr "附加單位介面 (AUI)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+#: src/connection-editor/ce-page-ethernet.ui:26
 msgid "BNC"
 msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#: src/connection-editor/ce-page-ethernet.ui:29
 msgid "Media Independent Interface (MII)"
 msgstr "媒體獨立介面 (MII)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#: src/connection-editor/ce-page-ethernet.ui:40
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#: src/connection-editor/ce-page-ethernet.ui:43
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+#: src/connection-editor/ce-page-ethernet.ui:46
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+#: src/connection-editor/ce-page-ethernet.ui:49
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:60
 msgid "Half"
 msgstr "半"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#: src/connection-editor/ce-page-ethernet.ui:63
 msgid "Full"
 msgstr "完整"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:12
-#: ../src/connection-editor/page-ip6.c:156
+#: src/connection-editor/ce-page-ethernet.ui:74
+#: src/connection-editor/page-ip6.c:156
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:13
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:192
+#: src/connection-editor/ce-page-ethernet.ui:80
+#: src/connection-editor/ce-page-ip4.ui:18
+#: src/connection-editor/ce-page-ip6.ui:18 src/connection-editor/page-ip4.c:169
+#: src/connection-editor/page-ip6.c:192
 msgid "Manual"
 msgstr "手動"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: src/connection-editor/ce-page-ethernet.ui:97
 #, fuzzy
 msgid "_Port"
 msgstr "連接埠(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-infiniband.ui.h:6
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-#, fuzzy
-msgid "_Device"
-msgstr "服務(_S)："
-
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: src/connection-editor/ce-page-ethernet.ui:156
+#: src/connection-editor/ce-page-wifi.ui:169
 #, fuzzy
 msgid "C_loned MAC address"
 msgstr "複製的 MAC 位址(_L)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+#: src/connection-editor/ce-page-ethernet.ui:242
 #, fuzzy
 msgid "Wake on LAN"
 msgstr "私密金鑰密碼(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#: src/connection-editor/ce-page-ethernet.ui:258
 #, fuzzy
 msgid "De_fault"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: src/connection-editor/ce-page-ethernet.ui:274
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: src/connection-editor/ce-page-ethernet.ui:290
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: src/connection-editor/ce-page-ethernet.ui:305
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: src/connection-editor/ce-page-ethernet.ui:320
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: src/connection-editor/ce-page-ethernet.ui:335
 #, fuzzy
 msgid "_Broadcast"
 msgstr "廣播"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: src/connection-editor/ce-page-ethernet.ui:350
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: src/connection-editor/ce-page-ethernet.ui:365
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: src/connection-editor/ce-page-ethernet.ui:388
 #, fuzzy
 msgid "_Wake on LAN password"
 msgstr "私密金鑰密碼(_P)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+#: src/connection-editor/ce-page-ethernet.ui:402
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "局域網喚醒密碼（以太網MAC）。它僅對魔術包有效。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:30
+#: src/connection-editor/ce-page-ethernet.ui:414
 msgid "Lin_k negotiation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:31
+#: src/connection-editor/ce-page-ethernet.ui:428
 msgid ""
 "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values "
 "will be forced without checking the device compatibility. If unsure, leave "
@@ -1865,12 +1934,12 @@ msgstr ""
 "設備鏈接協商。如果選擇“手動”，將強制“速度”和“雙工”值，而不檢查設備兼容性。如"
 "果不確定，請在此處“忽略”或選擇“自動”。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:32
+#: src/connection-editor/ce-page-ethernet.ui:448
 #, fuzzy
 msgid "_Speed"
 msgstr "速度(_S)："
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:33
+#: src/connection-editor/ce-page-ethernet.ui:462
 msgid ""
 "Speed value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a speed value be "
@@ -1879,12 +1948,12 @@ msgstr ""
 "靜態鏈接協商的速度值，僅在未選擇“忽略”和“自動”選項時才需要。在指定速度值之"
 "前，請確保您的設備支持它。"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:34
+#: src/connection-editor/ce-page-ethernet.ui:482
 #, fuzzy
 msgid "Duple_x"
 msgstr "全雙工(_X)"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:35
+#: src/connection-editor/ce-page-ethernet.ui:496
 msgid ""
 "Duplex value for static link negotiation, required only when “Ignore” and "
 "“Automatic” options are not selected. Before specifying a duplex mode be "
@@ -1893,35 +1962,35 @@ msgstr ""
 "靜態鏈接協商的雙工值，僅在未選擇“忽略”和“自動”選項時才需要。在指定雙工模式之"
 "前，請確保您的設備支持它。"
 
-#: ../src/connection-editor/ce-page-general.ui.h:2
+#: src/connection-editor/ce-page-general.ui:29
 msgid "Yes"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:3
+#: src/connection-editor/ce-page-general.ui:32
 #, fuzzy
 msgid "No"
 msgstr "沒有"
 
-#: ../src/connection-editor/ce-page-general.ui.h:4
+#: src/connection-editor/ce-page-general.ui:65
 msgid "All _users may connect to this network"
 msgstr "所有的使用者可以連線至這個網路"
 
-#: ../src/connection-editor/ce-page-general.ui.h:5
+#: src/connection-editor/ce-page-general.ui:80
 #, fuzzy
 msgid "Automatically connect to _VPN"
 msgstr "當使用這個連線時自動連線至 _VPN"
 
-#: ../src/connection-editor/ce-page-general.ui.h:6
+#: src/connection-editor/ce-page-general.ui:96
 #, fuzzy
 msgid "Firewall _zone"
 msgstr "防火牆地帶(_Z)："
 
-#: ../src/connection-editor/ce-page-general.ui.h:7
+#: src/connection-editor/ce-page-general.ui:121
 #, fuzzy
 msgid "_Metered connection"
 msgstr "團隊連線(_T):"
 
-#: ../src/connection-editor/ce-page-general.ui.h:8
+#: src/connection-editor/ce-page-general.ui:134
 msgid ""
 "NetworkManager indicates to applications whether the connection is metered "
 "and therefore data usage should be restricted. Select which value (“Yes” or "
@@ -1929,12 +1998,12 @@ msgid ""
 "based on the connection type and other heuristics."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-general.ui.h:9
+#: src/connection-editor/ce-page-general.ui:150
 #, fuzzy
 msgid "Connect _automatically with priority"
 msgstr "忽略自動獲得的路由(_N)"
 
-#: ../src/connection-editor/ce-page-general.ui.h:10
+#: src/connection-editor/ce-page-general.ui:167
 msgid ""
 "Connection priority for automatic activation. Connections with higher "
 "numbers are preferred when selecting profiles for automatic activation. "
@@ -1943,14 +2012,14 @@ msgstr ""
 "自動激活的連接優先級。選擇自動激活的配置文件時，首選更高編號的連接。默認值為"
 "0。"
 
-#: ../src/connection-editor/ce-page.h:109
+#: src/connection-editor/ce-page.h:109
 #, fuzzy
 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 "用來在網路上區別您的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-page.h:114
+#: src/connection-editor/ce-page.h:114
 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 "
@@ -1960,132 +2029,131 @@ msgstr ""
 "IP地址標識網絡上的計算機，並確定分發給其他計算機的地址範圍。單擊“添加”按鈕添"
 "加IP地址。如果未提供地址，將自動確定範圍。"
 
-#: ../src/connection-editor/ce-page.h:119
+#: src/connection-editor/ce-page.h:119
 #, fuzzy
 msgid "Additional static addresses"
 msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/ce-page.h:120
+#: src/connection-editor/ce-page.h:120
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page.h:121
+#: src/connection-editor/ce-page.h:121
 msgid "Address (optional)"
 msgstr "地址（可選）"
 
 #. IP-over-InfiniBand "datagram mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: src/connection-editor/ce-page-infiniband.ui:17
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: src/connection-editor/ce-page-infiniband.ui:20
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
+#: src/connection-editor/ce-page-infiniband.ui:37
 #, fuzzy
 msgid "_Transport mode"
 msgstr "傳輸模式(_T)："
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:1
+#: src/connection-editor/ce-page-ip-tunnel.ui:17
 msgid "IPIP"
 msgstr "IPIP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:2
+#: src/connection-editor/ce-page-ip-tunnel.ui:20
 msgid "GRE"
 msgstr "GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:3
+#: src/connection-editor/ce-page-ip-tunnel.ui:23
 msgid "SIT"
 msgstr "SIT"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:4
+#: src/connection-editor/ce-page-ip-tunnel.ui:26
 msgid "ISATAP"
 msgstr "ISATAP"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:5
+#: src/connection-editor/ce-page-ip-tunnel.ui:29
 msgid "VTI"
 msgstr "VTI"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:32
 msgid "IP6IP6"
 msgstr "IP6IP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:7
+#: src/connection-editor/ce-page-ip-tunnel.ui:35
 msgid "IPIP6"
 msgstr "IPIP6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:38
 msgid "IP6GRE"
 msgstr "IP6GRE"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:9
+#: src/connection-editor/ce-page-ip-tunnel.ui:41
 msgid "VTI6"
 msgstr "VTI6"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:10
-#: ../src/connection-editor/ce-page-macsec.ui.h:6
+#: src/connection-editor/ce-page-ip-tunnel.ui:61
+#: src/connection-editor/ce-page-macsec.ui:58
 #, fuzzy
 msgid "Device name"
 msgstr "裝置名稱 + 編號"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:11
-#: ../src/connection-editor/ce-page-macsec.ui.h:8
+#: src/connection-editor/ce-page-ip-tunnel.ui:85
+#: src/connection-editor/ce-page-macsec.ui:83
 #, fuzzy
 msgid "Parent device"
 msgstr "有線網路"
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:12
-#: ../src/connection-editor/ce-page-macsec.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:115
+#: src/connection-editor/ce-page-macsec.ui:180
 msgid "Mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:13
+#: src/connection-editor/ce-page-ip-tunnel.ui:128
 msgid "Local IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:14
+#: src/connection-editor/ce-page-ip-tunnel.ui:140
 msgid "Remote IP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:15
+#: src/connection-editor/ce-page-ip-tunnel.ui:152
 msgid "Input key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:16
+#: src/connection-editor/ce-page-ip-tunnel.ui:164
 msgid "Output key"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip-tunnel.ui.h:17
+#: src/connection-editor/ce-page-ip-tunnel.ui:245
 #, fuzzy
 msgid "MTU"
 msgstr "_MTU："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: src/connection-editor/ce-page-ip4.ui:15
+#: src/connection-editor/ce-page-ip6.ui:15
 msgid "Automatic with manual DNS settings"
 msgstr "自動使用手動 DNS 設定值"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: src/connection-editor/ce-page-ip4.ui:21
+#: src/connection-editor/ce-page-ip6.ui:21
 msgid "Link-Local"
 msgstr "本機連線"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:212
+#: src/connection-editor/ce-page-ip4.ui:24
+#: src/connection-editor/ce-page-ip6.ui:24 src/connection-editor/page-ip4.c:189
+#: src/connection-editor/page-ip6.c:212
 msgid "Shared to other computers"
 msgstr "分享給其他電腦"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:47
+#: src/connection-editor/ce-page-ip6.ui:78
 #, fuzzy
 msgid "_Method"
 msgstr "方法(_M)："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: src/connection-editor/ce-page-ip4.ui:202
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -2095,35 +2163,33 @@ msgstr ""
 "DHCP 用戶端識別能讓網管人員客製您電腦上的配置。如果您想要使用 DHCP 用戶端識"
 "別，請在此輸入。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:215
+#: src/connection-editor/ce-page-ip6.ui:233
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 msgstr "用來解析主機名稱的網域。請使用逗號隔開不同的網域。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: src/connection-editor/ce-page-ip4.ui:228
 #, fuzzy
 msgid "D_HCP client ID"
 msgstr "D_HCP 用戶端 ID："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:373
-#: ../src/connection-editor/page-ip6.c:347
+#: src/connection-editor/ce-page-ip4.ui:242
+#: src/connection-editor/ce-page-ip6.ui:246
+#: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347
 #, fuzzy
 msgid "S_earch domains"
 msgstr "搜尋網域(_E)："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:364
-#: ../src/connection-editor/page-ip6.c:338
+#: src/connection-editor/ce-page-ip4.ui:256
+#: src/connection-editor/ce-page-ip6.ui:260
+#: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338
 #, fuzzy
 msgid "DNS ser_vers"
 msgstr "_DNS 伺服器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: src/connection-editor/ce-page-ip4.ui:270
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -2131,11 +2197,11 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: src/connection-editor/ce-page-ip4.ui:288
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "需要 IPv_4 addressing 才可完成此連線"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: src/connection-editor/ce-page-ip4.ui:292
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2143,34 +2209,34 @@ msgstr ""
 "當連至可使用 IPv6 的網路時，若 IPv4 配置失敗，不過 IPv6 配置卻成功的話，請允"
 "許連線完成。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:22
+#: src/connection-editor/ce-page-ip4.ui:333
+#: src/connection-editor/ce-page-ip6.ui:401
 msgid "_Routes…"
 msgstr "路由(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/ce-page-macsec.ui.h:3
-#: ../src/connection-editor/page-ip4.c:199
+#: src/connection-editor/ce-page-ip6.ui:35
+#: src/connection-editor/ce-page-macsec.ui:32
+#: src/connection-editor/page-ip4.c:199
 msgid "Disabled"
 msgstr "已停用"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: src/connection-editor/ce-page-ip6.ui:38
 msgid "Enabled (prefer public address)"
 msgstr "啟用 (偏好公開位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: src/connection-editor/ce-page-ip6.ui:41
 msgid "Enabled (prefer temporary address)"
 msgstr "啟用 (偏好暫時位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: src/connection-editor/ce-page-ip6.ui:52
 msgid "EUI64"
 msgstr "EUI64"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: src/connection-editor/ce-page-ip6.ui:55
 msgid "Stable privacy"
 msgstr "穩定的隱私"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: src/connection-editor/ce-page-ip6.ui:274
 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 "
@@ -2179,20 +2245,20 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。Link-local 位址會自動設定到連線中的介面。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: src/connection-editor/ce-page-ip6.ui:287
 #, fuzzy
 msgid "IPv6 _privacy extensions"
 msgstr "I_Pv6 隱私擴充功能："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: src/connection-editor/ce-page-ip6.ui:319
 msgid "IPv6 address _generation mode"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:20
+#: src/connection-editor/ce-page-ip6.ui:356
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "需要 IPv_6 addressing 才可完成此連線"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#: src/connection-editor/ce-page-ip6.ui:360
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2200,48 +2266,48 @@ msgstr ""
 "當連至可使用 IPv4 的網路時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允"
 "許連線完成。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:1
+#: src/connection-editor/ce-page-macsec.ui:12
 msgid "PSK"
 msgstr "PSK"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:2
-#: ../src/connection-editor/page-ppp.c:129
+#: src/connection-editor/ce-page-macsec.ui:15
+#: src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:4
+#: src/connection-editor/ce-page-macsec.ui:35
 msgid "Check"
 msgstr "校驗"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:5
+#: src/connection-editor/ce-page-macsec.ui:38
 msgid "Strict"
 msgstr "嚴格"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:7
+#: src/connection-editor/ce-page-macsec.ui:69
 msgid "The name of the MACsec device."
 msgstr "MACsec設備的名稱。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:9
+#: src/connection-editor/ce-page-macsec.ui:94
 msgid ""
 "The parent interface name or parent connection UUID from which this MACSEC "
 "interface should be created."
 msgstr "應從中創建此MACSEC接口的父接口名稱或父連接UUID。"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:10
+#: src/connection-editor/ce-page-macsec.ui:100
 msgid ""
 "The parent interface name or parent connection UUID from which this MACsec "
 "interface should be created"
 msgstr "應從中創建此MACsec接口的父接口名稱或父連接UUID"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:11
+#: src/connection-editor/ce-page-macsec.ui:113
 msgid " The pre-shared Connectivity-association Key Name"
 msgstr " 預共享連接關聯密鑰名稱"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:12
+#: src/connection-editor/ce-page-macsec.ui:124
 msgid "The pre-shared Connectivity Association Key"
 msgstr "預共享連接關聯密鑰"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:13
+#: src/connection-editor/ce-page-macsec.ui:135
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X "
@@ -2250,360 +2316,360 @@ msgstr ""
 "指定如何獲取MKA的CAK（連接關聯密鑰）（MACsec密鑰協議）。對於EAP模式，請填寫"
 "802.1X安全頁面中的參數"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:14
+#: src/connection-editor/ce-page-macsec.ui:154
 msgid "CKN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:15
+#: src/connection-editor/ce-page-macsec.ui:167
 msgid "CAK"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:17
+#: src/connection-editor/ce-page-macsec.ui:191
 msgid "Keys"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:18
+#: src/connection-editor/ce-page-macsec.ui:207
 msgid "Parameters"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:19
+#: src/connection-editor/ce-page-macsec.ui:224
 msgid "Validation"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:20
+#: src/connection-editor/ce-page-macsec.ui:236
 msgid "SCI port"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:21
+#: src/connection-editor/ce-page-macsec.ui:247
 msgid "Specifies the validation mode for incoming frames"
 msgstr "指定傳入幀的驗證模式"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:22
+#: src/connection-editor/ce-page-macsec.ui:263
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:23
+#: src/connection-editor/ce-page-macsec.ui:267
 msgid "Whether the transmitted traffic must be encrypted"
 msgstr "傳輸的流量是否必須加密"
 
-#: ../src/connection-editor/ce-page-macsec.ui.h:24
+#: src/connection-editor/ce-page-macsec.ui:279
 msgid "The port component of the SCI (Secure Channel Identifier)"
 msgstr "SCI的端口組件（安全通道標識符）"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:26
+#: src/connection-editor/ce-page-mobile.ui:25
+#: src/connection-editor/ce-page-team.ui:463
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#: src/connection-editor/ce-page-mobile.ui:48
 #, fuzzy
 msgid "Nu_mber"
 msgstr "數字(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#: src/connection-editor/ce-page-mobile.ui:142
 msgid "Advanced"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#: src/connection-editor/ce-page-mobile.ui:165
 #, fuzzy
 msgid "_APN"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: src/connection-editor/ce-page-mobile.ui:179
 #, fuzzy
 msgid "N_etwork ID"
 msgstr "網路 ID(_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: src/connection-editor/ce-page-mobile.ui:221
 #, fuzzy
 msgid "Change…"
 msgstr "變更…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: src/connection-editor/ce-page-mobile.ui:242
 #, fuzzy
 msgid "P_IN"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: src/connection-editor/ce-page-mobile.ui:266
 msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網路無法使用，允許使用漫遊(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:454
+#: src/connection-editor/ce-page-mobile.ui:303
+#: src/libnma/nma-pkcs11-cert-chooser.c:454
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#: src/connection-editor/ce-page-ppp.ui:24
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
+#: src/connection-editor/ce-page-ppp.ui:53
 #, fuzzy
 msgid "Allowed methods"
 msgstr "允許的方式："
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#: src/connection-editor/ce-page-ppp.ui:89
 msgid "Configure _Methods…"
 msgstr "設定方法(_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#: src/connection-editor/ce-page-ppp.ui:132
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: src/connection-editor/ce-page-ppp.ui:159
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "使用點對點式加密 (MPPE)(_U)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#: src/connection-editor/ce-page-ppp.ui:181
 msgid "_Require 128-bit encryption"
 msgstr "需要 128-位元加密(_R)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#: src/connection-editor/ce-page-ppp.ui:196
 msgid "Use _stateful MPPE"
 msgstr "使用有狀態的 MPPE(_S)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#: src/connection-editor/ce-page-ppp.ui:225
 msgid "Allow _BSD data compression"
 msgstr "允許 _BSD 資料壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#: src/connection-editor/ce-page-ppp.ui:240
 msgid "Allow _Deflate data compression"
 msgstr "允許 _Deflate 資料壓縮"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#: src/connection-editor/ce-page-ppp.ui:255
 msgid "Use TCP _header compression"
 msgstr "使用 TCP 標頭壓縮(_H)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
+#: src/connection-editor/ce-page-ppp.ui:292
 msgid "Echo"
 msgstr "回響"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: src/connection-editor/ce-page-ppp.ui:306
 msgid "Send PPP _echo packets"
 msgstr "傳送 PPP _echo 封包"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:25
+#: src/connection-editor/ce-page-proxy.ui:23
+#: src/connection-editor/ce-page-team.ui:459
 msgid "None"
 msgstr "無"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:3
+#: src/connection-editor/ce-page-proxy.ui:34
 msgid "For browser only"
 msgstr "僅限瀏覽器"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:4
+#: src/connection-editor/ce-page-proxy.ui:38
 msgid "Use this proxy configuration for only browser clients/schemes."
 msgstr "僅將此代理配置用於瀏覽器客戶端/方案。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:5
+#: src/connection-editor/ce-page-proxy.ui:52
 msgid "PAC URL"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:6
+#: src/connection-editor/ce-page-proxy.ui:64
 msgid "PAC script"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:7
+#: src/connection-editor/ce-page-proxy.ui:76
 msgid "URL from where the PAC script is to be obtained."
 msgstr "要從中獲取PAC腳本的URL。"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:8
+#: src/connection-editor/ce-page-proxy.ui:86
 #, fuzzy
 msgid "Import script from a file…"
 msgstr "從檔案匯入團隊組態(_I)…"
 
-#: ../src/connection-editor/ce-page-proxy.ui.h:9
+#: src/connection-editor/ce-page-proxy.ui:101
 #, fuzzy
 msgid "Method"
 msgstr "方法(_M)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1
-#: ../src/connection-editor/ce-page-team.ui.h:19
+#: src/connection-editor/ce-page-team-port.ui:47
+#: src/connection-editor/ce-page-team.ui:400
 #, fuzzy
 msgid "Ad_vanced…"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#: src/connection-editor/ce-page-team-port.ui:108
 msgid "Set by master"
 msgstr "由主人設定"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:3
-#: ../src/connection-editor/ce-page-team.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:112
+#: src/connection-editor/ce-page-team.ui:85
 #, fuzzy
 msgid "Ethernet port state"
 msgstr "有線網路"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:4
-#: ../src/connection-editor/ce-page-team.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:116
+#: src/connection-editor/ce-page-team.ui:89
 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
+#: src/connection-editor/ce-page-team-port.ui:120
+#: src/connection-editor/ce-page-team.ui:93
 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
+#: src/connection-editor/ce-page-team-port.ui:151
+#: src/connection-editor/ce-page-team.ui:526
 msgid "Team Advanced Options"
 msgstr "團隊高級選項"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:7
+#: src/connection-editor/ce-page-team-port.ui:225
 msgid "_Queue ID"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:8
-#: ../src/connection-editor/ce-page-team.ui.h:42
+#: src/connection-editor/ce-page-team-port.ui:239
+#: src/connection-editor/ce-page-team.ui:662
 msgid ""
 "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after "
 "port is enabled or disabled."
 msgstr "啟用或禁用端口後發送的未經請求的NA和免費ARP數據包的突發數。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:9
+#: src/connection-editor/ce-page-team-port.ui:241
 msgid "ID of queue which this port should be mapped to."
 msgstr "此端口應映射到的隊列的ID。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:10
+#: src/connection-editor/ce-page-team-port.ui:255
 msgid "Active-Backup runner options"
 msgstr "Active-Backup運行選項"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:11
+#: src/connection-editor/ce-page-team-port.ui:271
 #, fuzzy
 msgid "_Port priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:12
-#: ../src/connection-editor/ce-page-team.ui.h:44
+#: src/connection-editor/ce-page-team-port.ui:284
+#: src/connection-editor/ce-page-team.ui:712
 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:13
+#: src/connection-editor/ce-page-team-port.ui:286
 msgid "Port priority. The higher number means higher priority."
 msgstr "端口優先級。數字越大意味著優先級越高。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:14
+#: src/connection-editor/ce-page-team-port.ui:297
 msgid "Port _sticky"
 msgstr "端口_sticky"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:15
+#: src/connection-editor/ce-page-team-port.ui:301
 msgid "Do not unselect the port if a better one becomes available."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:16
+#: src/connection-editor/ce-page-team-port.ui:316
 msgid "LACP runner options"
 msgstr "LACP跑步選項"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:17
+#: src/connection-editor/ce-page-team-port.ui:332
 #, fuzzy
 msgid "_LACP port priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:18
+#: src/connection-editor/ce-page-team-port.ui:346
 #, fuzzy
 msgid "LACP port _key"
 msgstr "私密金鑰(_K)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:19
-#: ../src/connection-editor/ce-page-team.ui.h:43
+#: src/connection-editor/ce-page-team-port.ui:359
+#: src/connection-editor/ce-page-team.ui:675
 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:20
+#: src/connection-editor/ce-page-team-port.ui:361
 msgid ""
 "Port priority according to LACP standard. The lower number means higher "
 "priority."
 msgstr "根據LACP標準的端口優先級。數字越小意味著優先級越高。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:21
-#: ../src/connection-editor/ce-page-team.ui.h:45
+#: src/connection-editor/ce-page-team-port.ui:374
+#: src/connection-editor/ce-page-team.ui:725
 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:22
+#: src/connection-editor/ce-page-team-port.ui:376
 msgid ""
 "Port key according to LACP standard. It is only possible to aggregate ports "
 "with the same key."
 msgstr "端口密鑰符合LACP標準。只能使用相同的密鑰聚合端口。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:24
-#: ../src/connection-editor/ce-page-team.ui.h:70
+#: src/connection-editor/ce-page-team-port.ui:416
+#: src/connection-editor/ce-page-team.ui:1142
 msgid "_Link watcher"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:25
-#: ../src/connection-editor/ce-page-team.ui.h:71
+#: src/connection-editor/ce-page-team-port.ui:431
+#: src/connection-editor/ce-page-team.ui:1157
 #, fuzzy
 msgid "_Up delay"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:26
-#: ../src/connection-editor/ce-page-team.ui.h:72
+#: src/connection-editor/ce-page-team-port.ui:446
+#: src/connection-editor/ce-page-team.ui:1172
 #, fuzzy
 msgid "_Down delay"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:27
-#: ../src/connection-editor/ce-page-team.ui.h:73
+#: src/connection-editor/ce-page-team-port.ui:461
+#: src/connection-editor/ce-page-team.ui:1187
 #, fuzzy
 msgid "Send _interval"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:28
-#: ../src/connection-editor/ce-page-team.ui.h:74
+#: src/connection-editor/ce-page-team-port.ui:476
+#: src/connection-editor/ce-page-team.ui:1202
 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
+#: src/connection-editor/ce-page-team-port.ui:491
+#: src/connection-editor/ce-page-team.ui:1217
 msgid "_Maximum missed replies"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:30
-#: ../src/connection-editor/ce-page-team.ui.h:76
+#: src/connection-editor/ce-page-team-port.ui:506
+#: src/connection-editor/ce-page-team.ui:1232
 #, fuzzy
 msgid "_Source host"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:31
-#: ../src/connection-editor/ce-page-team.ui.h:77
+#: src/connection-editor/ce-page-team-port.ui:521
+#: src/connection-editor/ce-page-team.ui:1247
 #, fuzzy
 msgid "_Target host"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:32
-#: ../src/connection-editor/ce-page-team.ui.h:78
+#: src/connection-editor/ce-page-team-port.ui:535
+#: src/connection-editor/ce-page-team.ui:1261
 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
+#: src/connection-editor/ce-page-team-port.ui:548
+#: src/connection-editor/ce-page-team.ui:1274
 msgid ""
 "Hostname to be converted to IP address which will be filled into ARP request "
 "as source address."
 msgstr "要轉換為IP地址的主機名，將作為源地址填入ARP請求。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:34
-#: ../src/connection-editor/ce-page-team.ui.h:80
+#: src/connection-editor/ce-page-team-port.ui:560
+#: src/connection-editor/ce-page-team.ui:1286
 msgid ""
 "Hostname to be converted to IP address which will be filled into request as "
 "destination address."
 msgstr "要轉換為IP地址的主機名，該地址將作為目標地址填充到請求中。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:35
-#: ../src/connection-editor/ce-page-team.ui.h:81
+#: src/connection-editor/ce-page-team-port.ui:570
+#: src/connection-editor/ce-page-team.ui:1296
 msgid "Ignore invalid packets from _active ports"
 msgstr "忽略來自_active端口的無效數據包"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:36
-#: ../src/connection-editor/ce-page-team.ui.h:82
+#: src/connection-editor/ce-page-team-port.ui:574
+#: src/connection-editor/ce-page-team.ui:1300
 msgid ""
 "Validate received ARP packets on active ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2611,13 +2677,13 @@ msgstr ""
 "驗證活動端口上收到的ARP數據包。如果未選中此選項，則所有傳入的ARP數據包都將被"
 "視為良好回复。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:37
-#: ../src/connection-editor/ce-page-team.ui.h:83
+#: src/connection-editor/ce-page-team-port.ui:587
+#: src/connection-editor/ce-page-team.ui:1313
 msgid "Ignore invalid packets from i_nactive ports"
 msgstr "忽略來自i_nactive端口的無效數據包"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:38
-#: ../src/connection-editor/ce-page-team.ui.h:84
+#: src/connection-editor/ce-page-team-port.ui:591
+#: src/connection-editor/ce-page-team.ui:1317
 msgid ""
 "Validate received ARP packets on inactive ports. If this is not checked, all "
 "incoming ARP packets will be considered as a good reply."
@@ -2625,219 +2691,218 @@ msgstr ""
 "驗證非活動端口上收到的ARP數據包。如果未選中此選項，則所有傳入的ARP數據包都將"
 "被視為良好回复。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:39
-#: ../src/connection-editor/ce-page-team.ui.h:85
+#: src/connection-editor/ce-page-team-port.ui:604
+#: src/connection-editor/ce-page-team.ui:1330
 msgid "S_end on inactive ports"
 msgstr "S_end在非活動端口上"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:40
-#: ../src/connection-editor/ce-page-team.ui.h:86
+#: src/connection-editor/ce-page-team-port.ui:608
+#: src/connection-editor/ce-page-team.ui:1334
 msgid ""
 "By default, ARP requests are sent on active ports only. This option allows "
 "sending even on inactive ports."
 msgstr ""
 "默認情況下，ARP請求僅在活動端口上發送。此選項允許甚至在非活動端口上發送。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:41
-#: ../src/connection-editor/ce-page-team.ui.h:87
+#: src/connection-editor/ce-page-team-port.ui:671
+#: src/connection-editor/ce-page-team.ui:1397
 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:42
-#: ../src/connection-editor/ce-page-team.ui.h:88
+#: src/connection-editor/ce-page-team-port.ui:684
+#: src/connection-editor/ce-page-team.ui:1410
 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:43
-#: ../src/connection-editor/ce-page-team.ui.h:89
+#: src/connection-editor/ce-page-team-port.ui:697
+#: src/connection-editor/ce-page-team.ui:1423
 msgid "The interval between requests being sent."
 msgstr "發送請求之間的間隔。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:44
-#: ../src/connection-editor/ce-page-team.ui.h:90
+#: src/connection-editor/ce-page-team-port.ui:710
+#: src/connection-editor/ce-page-team.ui:1436
 msgid ""
 "The delay between link watch initialization and the first request being sent."
 msgstr "鏈接監視初始化和發送的第一個請求之間的延遲。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:45
-#: ../src/connection-editor/ce-page-team.ui.h:91
+#: src/connection-editor/ce-page-team-port.ui:723
+#: src/connection-editor/ce-page-team.ui:1449
 msgid "The link watcher to be used."
 msgstr "要使用的鏈接監視器。"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:46
-#: ../src/connection-editor/ce-page-team.ui.h:92
+#: src/connection-editor/ce-page-team-port.ui:770
+#: src/connection-editor/ce-page-team.ui:1496
 msgid "Link Watcher"
 msgstr "Link Watcher"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:47
-#: ../src/connection-editor/ce-page-team.ui.h:93
+#: src/connection-editor/ce-page-team-port.ui:790
+#: src/connection-editor/ce-page-team.ui:1516
 #, fuzzy
 msgid "Im_port team configuration from a file…"
 msgstr "從檔案匯入團隊組態(_I)…"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:48
-#: ../src/connection-editor/ce-page-team.ui.h:94
+#: src/connection-editor/ce-page-team-port.ui:826
+#: src/connection-editor/ce-page-team.ui:1552
 #, fuzzy
 msgid "Edit _JSON configuration"
 msgstr "_JSON 設定:"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:49
-#: ../src/connection-editor/ce-page-team.ui.h:95
+#: src/connection-editor/ce-page-team-port.ui:845
+#: src/connection-editor/ce-page-team.ui:1571
 msgid "Raw Configuration"
 msgstr "原始配置"
 
-#: ../src/connection-editor/ce-page-team.ui.h:1
+#: src/connection-editor/ce-page-team.ui:15
 msgid "Highest priority"
 msgstr "最高優先級"
 
-#: ../src/connection-editor/ce-page-team.ui.h:2
+#: src/connection-editor/ce-page-team.ui:19
 msgid "Highest priority (stable)"
 msgstr "最高優先級（穩定）"
 
-#: ../src/connection-editor/ce-page-team.ui.h:3
+#: src/connection-editor/ce-page-team.ui:23
 #, fuzzy
 msgid "Bandwidth"
 msgstr "群組頻寬："
 
-#: ../src/connection-editor/ce-page-team.ui.h:4
+#: src/connection-editor/ce-page-team.ui:27
 msgid "Highest number of ports"
 msgstr "最多端口"
 
-#: ../src/connection-editor/ce-page-team.ui.h:5
+#: src/connection-editor/ce-page-team.ui:31
 #, fuzzy
 msgid "Port priority"
 msgstr "優先順序"
 
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: src/connection-editor/ce-page-team.ui:57
 #, fuzzy
 msgid "From the team device"
 msgstr "有線網路"
 
-#: ../src/connection-editor/ce-page-team.ui.h:7
+#: src/connection-editor/ce-page-team.ui:61
 msgid "From the active port"
 msgstr "從活動端口"
 
-#: ../src/connection-editor/ce-page-team.ui.h:8
+#: src/connection-editor/ce-page-team.ui:65
 msgid "From active to team device"
 msgstr "從活動到團隊設備"
 
-#: ../src/connection-editor/ce-page-team.ui.h:12
+#: src/connection-editor/ce-page-team.ui:174
 #, fuzzy
 msgid "_Teamed connections"
 msgstr "團隊連線(_T):"
 
-#: ../src/connection-editor/ce-page-team.ui.h:23
+#: src/connection-editor/ce-page-team.ui:441
 msgid "Load balance"
 msgstr "負載均衡"
 
-#: ../src/connection-editor/ce-page-team.ui.h:24
+#: src/connection-editor/ce-page-team.ui:445
 msgid "LACP"
 msgstr "LACP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:27
-#: ../src/connection-editor/connection-helpers.c:105
-#: ../src/connection-editor/page-ethernet.c:348
-#: ../src/libnm-gtk/nm-ui-utils.c:321
+#: src/connection-editor/ce-page-team.ui:484
+#: src/connection-editor/connection-helpers.c:105
+#: src/connection-editor/page-ethernet.c:348 src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "有線網路"
 
-#: ../src/connection-editor/ce-page-team.ui.h:28
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-vlan.c:589 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:583
+#: src/connection-editor/ce-page-team.ui:488
+#: src/connection-editor/connection-helpers.c:120
+#: src/connection-editor/page-vlan.c:589 src/libnm-gtk/nm-ui-utils.c:339
+#: src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
 # translation auto-copied from project Satellite6 Hammer CLI Foreman, version 6.1, document hammer-cli-foreman
-#: ../src/connection-editor/ce-page-team.ui.h:31
+#: src/connection-editor/ce-page-team.ui:500
 msgid "IP"
 msgstr "IP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:32
+#: src/connection-editor/ce-page-team.ui:504
 msgid "Any L3 protocol"
 msgstr "任何L3協議"
 
-#: ../src/connection-editor/ce-page-team.ui.h:33
+#: src/connection-editor/ce-page-team.ui:508
 #, fuzzy
 msgid "TCP"
 msgstr "GTC"
 
-#: ../src/connection-editor/ce-page-team.ui.h:34
+#: src/connection-editor/ce-page-team.ui:512
 msgid "UDP"
 msgstr "UDP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:35
+#: src/connection-editor/ce-page-team.ui:516
 msgid "SCTP"
 msgstr "SCTP"
 
-#: ../src/connection-editor/ce-page-team.ui.h:36
+#: src/connection-editor/ce-page-team.ui:520
 msgid "Any L4 protocol"
 msgstr "任何L4協議"
 
-#: ../src/connection-editor/ce-page-team.ui.h:38
+#: src/connection-editor/ce-page-team.ui:603
 msgid "_Peer notification count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:39
+#: src/connection-editor/ce-page-team.ui:618
 msgid "Peer _notification interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:40
+#: src/connection-editor/ce-page-team.ui:633
 msgid "_Multicast rejoin count"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:41
+#: src/connection-editor/ce-page-team.ui:648
 msgid "Multicast _rejoin interval"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:46
+#: src/connection-editor/ce-page-team.ui:739
 #, fuzzy
 msgid "_Hardware Address"
 msgstr "硬體位址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:47
+#: src/connection-editor/ce-page-team.ui:752
 msgid ""
 "Desired hardware address of new team device. Usual MAC address format is "
 "accepted."
 msgstr "新團隊設備的所需硬件地址。通常的MAC地址格式被接受。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:49
+#: src/connection-editor/ce-page-team.ui:798
 msgid "_Runner"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:50
+#: src/connection-editor/ce-page-team.ui:813
 #, fuzzy
 msgid "_Hardware address policy"
 msgstr "硬體位址："
 
-#: ../src/connection-editor/ce-page-team.ui.h:51
+#: src/connection-editor/ce-page-team.ui:827
 msgid "Name of runner to be used."
 msgstr "要使用的跑步者姓名。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:52
+#: src/connection-editor/ce-page-team.ui:848
 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
+#: src/connection-editor/ce-page-team.ui:866
 msgid "Send LACPDU frames _periodically"
 msgstr "定期發送LACPDU幀"
 
-#: ../src/connection-editor/ce-page-team.ui.h:54
+#: src/connection-editor/ce-page-team.ui:870
 msgid ""
 "If checked, LACPDU frames are sent along the configured links periodically. "
 "If not, it acts as “speak when spoken to”."
 msgstr ""
 "如果選中，則會定期沿配置的鏈路發送LACPDU幀。如果不是，它就像“說話時說話”。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:55
+#: src/connection-editor/ce-page-team.ui:883
 msgid "Send a LACPDU frame _every second"
 msgstr "每隔一段時間發送一個LACPDU幀"
 
-#: ../src/connection-editor/ce-page-team.ui.h:56
+#: src/connection-editor/ce-page-team.ui:887
 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 "
@@ -2846,229 +2911,225 @@ msgstr ""
 "選項指定要求鏈接夥伴傳輸LACPDU數據包的速率。如果選中，數據包將每秒發送一次。"
 "否則他們將每30秒發送一次。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:57
+#: src/connection-editor/ce-page-team.ui:903
 #, fuzzy
 msgid "_System priority"
 msgstr "優先順序(_P)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:58
+#: src/connection-editor/ce-page-team.ui:918
 msgid "_Minimum ports"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:59
+#: src/connection-editor/ce-page-team.ui:933
 msgid "_Aggregator selection policy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-team.ui.h:60
+#: src/connection-editor/ce-page-team.ui:947
 msgid "System priority, value can be 0 – 65535."
 msgstr "系統優先級，值可以是0  -  65535。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:61
+#: src/connection-editor/ce-page-team.ui:959
 msgid ""
 "Specifies the minimum number of ports that must be active before asserting "
 "carrier in the master interface, value can be 1 – 255."
 msgstr ""
 "指定在主接口中聲明載波之前必須處於活動狀態的最小端口數，值可以是1  -  255。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:62
+#: src/connection-editor/ce-page-team.ui:971
 msgid "This selects the policy of how the aggregators will be selected."
 msgstr "這將選擇如何選擇聚合器的策略。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:63
+#: src/connection-editor/ce-page-team.ui:1006
 msgid ""
 "List of fragment types (strings) which should be used for packet Tx hash "
 "computation."
 msgstr "應該用於數據包Tx散列計算的片段類型（字符串）列表。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:64
+#: src/connection-editor/ce-page-team.ui:1035
 msgid "_Fields for transmission hash"
 msgstr "_Field用於傳輸哈希"
 
-#: ../src/connection-editor/ce-page-team.ui.h:65
+#: src/connection-editor/ce-page-team.ui:1051
 msgid "In tenths of a second. Periodic interval between rebalancing."
 msgstr "在十分之一秒。重新平衡之間的周期性間隔。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:66
+#: src/connection-editor/ce-page-team.ui:1063
 msgid "Name of active Tx balancer. Active Tx balancing is disabled by default."
 msgstr "活動Tx平衡器的名稱。默認情況下禁用活動Tx平衡。"
 
-#: ../src/connection-editor/ce-page-team.ui.h:67
+#: src/connection-editor/ce-page-team.ui:1085
 #, fuzzy
 msgid "Transmission _balancing interval"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:68
+#: src/connection-editor/ce-page-team.ui:1100
 #, fuzzy
 msgid "_Transmission balancer"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-team.ui.h:69
+#: src/connection-editor/ce-page-team.ui:1119
 msgid "Runner"
 msgstr "跑步者"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#: src/connection-editor/ce-page-vlan.ui:28
 #, fuzzy
 msgid "_Parent interface"
 msgstr "父介面(_P)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#: src/connection-editor/ce-page-vlan.ui:41
 #, fuzzy
 msgid "VLAN inter_face name"
 msgstr "VLAN 介面名稱(_N)："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#: src/connection-editor/ce-page-vlan.ui:55
 #, fuzzy
 msgid "Cloned MAC _address"
 msgstr "複製的 MA_C 位址："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:6
+#: src/connection-editor/ce-page-vlan.ui:140
 #, fuzzy
 msgid "VLAN _id"
 msgstr "VLAN _id："
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:7
+#: src/connection-editor/ce-page-vlan.ui:197
 msgid "Flags"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
+#: src/connection-editor/ce-page-vlan.ui:213
 msgid "_Reorder headers"
 msgstr "_Reorder標頭"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:9
+#: src/connection-editor/ce-page-vlan.ui:228
 msgid "_GVRP"
 msgstr "_GVRP"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#: src/connection-editor/ce-page-vlan.ui:243
 msgid "_Loose binding"
 msgstr "_Loose綁定"
 
-#: ../src/connection-editor/ce-page-vlan.ui.h:11
+#: src/connection-editor/ce-page-vlan.ui:258
 msgid "M_VRP"
 msgstr "M_VRP"
 
 #. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:13
+#: src/connection-editor/ce-page-vlan.ui:285
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:15
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#: src/connection-editor/ce-page-vlan.ui:288
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
-#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#: src/connection-editor/ce-page-wifi-security.ui:29
 #, fuzzy
 msgid "S_ecurity"
 msgstr "安全性(_E)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:2
+#: src/connection-editor/ce-page-wifi.ui:35
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:3
+#: src/connection-editor/ce-page-wifi.ui:38
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:4
+#: src/connection-editor/ce-page-wifi.ui:49
 msgid "Client"
 msgstr "用戶端"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:5
-msgid "Hotspot"
-msgstr "熱點"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
+#: src/connection-editor/ce-page-wifi.ui:55
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: src/connection-editor/ce-page-wifi.ui:203
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: src/connection-editor/ce-page-wifi.ui:222
 #, fuzzy
 msgid "Transmission po_wer"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: src/connection-editor/ce-page-wifi.ui:256
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: src/connection-editor/ce-page-wifi.ui:275
 #, fuzzy
 msgid "_Rate"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: src/connection-editor/ce-page-wifi.ui:311
 #, fuzzy
 msgid "_BSSID"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: src/connection-editor/ce-page-wifi.ui:336
 #, fuzzy
 msgid "C_hannel"
 msgstr "頻道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: src/connection-editor/ce-page-wifi.ui:368
 #, fuzzy
 msgid "Ban_d"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: src/connection-editor/ce-page-wifi.ui:414
 #, fuzzy
 msgid "SS_ID"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-polkit.c:63
-#: ../src/connection-editor/ce-polkit-button.c:74
+#: src/connection-editor/ce-polkit.c:63
+#: src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "沒有執行操作的polkit授權"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: src/connection-editor/ce-ppp-auth-methods.ui:76
 msgid "Allowed Authentication Methods"
 msgstr "允許的驗證方式"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: src/connection-editor/ce-ppp-auth-methods.ui:97
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: src/connection-editor/ce-ppp-auth-methods.ui:101
 msgid "Extensible Authentication Protocol"
 msgstr "可延伸的驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: src/connection-editor/ce-ppp-auth-methods.ui:113
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: src/connection-editor/ce-ppp-auth-methods.ui:117
 msgid "Password Authentication Protocol"
 msgstr "密碼驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: src/connection-editor/ce-ppp-auth-methods.ui:129
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: src/connection-editor/ce-ppp-auth-methods.ui:133
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: src/connection-editor/ce-ppp-auth-methods.ui:145
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: src/connection-editor/ce-ppp-auth-methods.ui:149
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: src/connection-editor/ce-ppp-auth-methods.ui:161
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+#: src/connection-editor/ce-ppp-auth-methods.ui:165
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定第 2 版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#: src/connection-editor/ce-ppp-auth-methods.ui:179
 #, fuzzy
 msgid ""
 "In most cases, the provider’s PPP servers will support all authentication "
@@ -3077,67 +3138,65 @@ msgstr ""
 "在大多數情況下，網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
 "嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/connection-helpers.c:106
-#: ../src/connection-editor/page-wifi.c:437 ../src/libnm-gtk/nm-ui-utils.c:323
+#: src/connection-editor/connection-helpers.c:106
+#: src/connection-editor/page-wifi.c:437 src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-bluetooth.c:120
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: src/connection-editor/connection-helpers.c:114
+#: src/connection-editor/page-bluetooth.c:120 src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "藍牙"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-dsl.c:217
+#: src/connection-editor/connection-helpers.c:115
+#: src/connection-editor/page-dsl.c:217
 msgid "DSL/PPPoE"
 msgstr "DSL/PPPoE"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-infiniband.c:145
-#: ../src/libnm-gtk/nm-ui-utils.c:331
+#: src/connection-editor/connection-helpers.c:116
+#: src/connection-editor/page-infiniband.c:145 src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:117
-#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333
-#: ../src/libnm-gtk/nm-ui-utils.c:577
+#: src/connection-editor/connection-helpers.c:117
+#: src/connection-editor/page-bond.c:443 src/libnm-gtk/nm-ui-utils.c:333
+#: src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "繫結"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335
-#: ../src/libnm-gtk/nm-ui-utils.c:579
+#: src/connection-editor/connection-helpers.c:118
+#: src/connection-editor/page-team.c:1028 src/libnm-gtk/nm-ui-utils.c:335
+#: src/libnm-gtk/nm-ui-utils.c:579
 msgid "Team"
 msgstr "團隊"
 
-#: ../src/connection-editor/connection-helpers.c:119
-#: ../src/connection-editor/page-bridge.c:230
-#: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581
+#: src/connection-editor/connection-helpers.c:119
+#: src/connection-editor/page-bridge.c:230 src/libnm-gtk/nm-ui-utils.c:337
+#: src/libnm-gtk/nm-ui-utils.c:581
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../src/connection-editor/connection-helpers.c:121
-#: ../src/connection-editor/page-ip-tunnel.c:173
+#: src/connection-editor/connection-helpers.c:121
+#: src/connection-editor/page-ip-tunnel.c:173
 msgid "IP tunnel"
 msgstr "IP隧道"
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-macsec.c:187
+#: src/connection-editor/connection-helpers.c:122
+#: src/connection-editor/page-macsec.c:187
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../src/connection-editor/connection-helpers.c:124
-#: ../src/connection-editor/connection-helpers.c:386
-#: ../src/connection-editor/page-vpn.c:100
+#: src/connection-editor/connection-helpers.c:124
+#: src/connection-editor/connection-helpers.c:386
+#: src/connection-editor/page-vpn.c:100
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:204
+#: src/connection-editor/connection-helpers.c:204
 msgid "No VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:209
+#: src/connection-editor/connection-helpers.c:209
 #, fuzzy
 msgid "The VPN plugin failed to import the VPN connection correctly: "
 msgstr ""
@@ -3145,406 +3204,402 @@ msgstr ""
 "\n"
 "錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/connection-helpers.c:293
-#: ../src/connection-editor/page-proxy.c:118
-#: ../src/connection-editor/page-team.c:341
-#: ../src/connection-editor/page-team-port.c:203
+#: src/connection-editor/connection-helpers.c:293
+#: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341
+#: src/connection-editor/page-team-port.c:203
 msgid "Select file to import"
 msgstr "選擇要匯入的檔案"
 
-#: ../src/connection-editor/connection-helpers.c:297
-#: ../src/connection-editor/page-proxy.c:122
-#: ../src/connection-editor/page-team.c:345
-#: ../src/connection-editor/page-team-port.c:207
+#: src/connection-editor/connection-helpers.c:297
+#: src/connection-editor/page-proxy.c:122 src/connection-editor/page-team.c:345
+#: src/connection-editor/page-team-port.c:207
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../src/connection-editor/connection-helpers.c:328
+#: src/connection-editor/connection-helpers.c:328
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: src/connection-editor/connection-helpers.c:355
 msgid "Virtual"
 msgstr "虛擬"
 
-#: ../src/connection-editor/connection-helpers.c:504
-#: ../src/connection-editor/connection-helpers.c:506
+#: src/connection-editor/connection-helpers.c:504
+#: src/connection-editor/connection-helpers.c:506
 #, fuzzy
 msgid "Import a saved VPN configuration…"
 msgstr "匯入已儲存的 VPN 組態…"
 
-#: ../src/connection-editor/connection-helpers.c:536
+#: src/connection-editor/connection-helpers.c:536
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
 
-#: ../src/connection-editor/connection-helpers.c:545
+#: src/connection-editor/connection-helpers.c:545
 msgid "Could not create new connection"
 msgstr "無法建立新連線"
 
-#: ../src/connection-editor/connection-helpers.c:708
+#: src/connection-editor/connection-helpers.c:708
 msgid "Connection delete failed"
 msgstr "刪除連線失敗"
 
-#: ../src/connection-editor/connection-helpers.c:756
+#: src/connection-editor/connection-helpers.c:756
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "您確定要刪除連線 %s ？"
 
-#: ../src/connection-editor/gtk/menus.ui.h:1
+#: src/connection-editor/gtk/menus.ui:6
 #, fuzzy
 msgid "_New Connection"
 msgstr "_VPN 連線"
 
-#: ../src/connection-editor/gtk/menus.ui.h:2
+#: src/connection-editor/gtk/menus.ui:13
 msgid "_Quit"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:697
-#: ../src/connection-editor/ip6-routes-dialog.c:718
-#: ../src/connection-editor/page-ip4.c:1133
-#: ../src/connection-editor/page-ip6.c:1115
+#: src/connection-editor/ip4-routes-dialog.c:697
+#: src/connection-editor/ip6-routes-dialog.c:718
+#: src/connection-editor/page-ip4.c:1133 src/connection-editor/page-ip6.c:1115
 msgid "Address"
 msgstr "地址"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:716
-#: ../src/connection-editor/page-ip4.c:1152
+#: src/connection-editor/ip4-routes-dialog.c:716
+#: src/connection-editor/page-ip4.c:1152
 msgid "Netmask"
 msgstr "網路遮罩"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:735
-#: ../src/connection-editor/ip6-routes-dialog.c:756
-#: ../src/connection-editor/page-ip4.c:1171
-#: ../src/connection-editor/page-ip6.c:1153
+#: src/connection-editor/ip4-routes-dialog.c:735
+#: src/connection-editor/ip6-routes-dialog.c:756
+#: src/connection-editor/page-ip4.c:1171 src/connection-editor/page-ip6.c:1153
 msgid "Gateway"
 msgstr "通訊閘"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:754
-#: ../src/connection-editor/ip6-routes-dialog.c:775
+#: src/connection-editor/ip4-routes-dialog.c:754
+#: src/connection-editor/ip6-routes-dialog.c:775
 msgid "Metric"
 msgstr "度量 (Metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:737
-#: ../src/connection-editor/page-ip6.c:1134
+#: src/connection-editor/ip6-routes-dialog.c:737
+#: src/connection-editor/page-ip6.c:1134
 msgid "Prefix"
 msgstr "前綴"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
+#: src/connection-editor/nm-connection-editor.c:110
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:114
+#: src/connection-editor/nm-connection-editor.c:114
 msgid "Editing un-named connection"
 msgstr "編輯未命名的連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:134
+#: src/connection-editor/nm-connection-editor.c:134
 #, fuzzy
 msgid "Missing connection name"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.c:350
+#: src/connection-editor/nm-connection-editor.c:350
 #, fuzzy
 msgid "Editor initializing…"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:357
-#: ../src/connection-editor/nm-connection-list.c:471
+#: src/connection-editor/nm-connection-editor.c:357
+#: src/connection-editor/nm-connection-list.c:471
 #, fuzzy
 msgid "Connection cannot be modified"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.c:372
+#: src/connection-editor/nm-connection-editor.c:372
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "設置無效 %s： %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:448
+#: src/connection-editor/nm-connection-editor.c:448
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr "連線編輯器找不到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/connection-editor/nm-connection-editor.c:581
-#: ../src/connection-editor/vpn-helpers.c:213
+#: src/connection-editor/nm-connection-editor.c:581
+#: src/connection-editor/vpn-helpers.c:213
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:582
+#: src/connection-editor/nm-connection-editor.c:582
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的變更。"
 
-#: ../src/connection-editor/nm-connection-editor.c:583
+#: src/connection-editor/nm-connection-editor.c:583
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:599
+#: src/connection-editor/nm-connection-editor.c:599
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:601
+#: src/connection-editor/nm-connection-editor.c:601
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:742
+#: src/connection-editor/nm-connection-editor.c:742
 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:762
+#: src/connection-editor/nm-connection-editor.c:762
 msgid "Error initializing editor"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:1169
+#: src/connection-editor/nm-connection-editor.c:1169
 msgid "Connection add failed"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#: src/connection-editor/nm-connection-editor.ui:35
 msgid "Fix"
 msgstr "固定"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: src/connection-editor/nm-connection-editor.ui:61
 #, fuzzy
 msgid ""
 "Security labels may prevent some files from being used with certificate "
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證中關於 CA 證書的警告。"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: src/connection-editor/nm-connection-editor.ui:110
 #, fuzzy
 msgid "Connection _name"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: src/connection-editor/nm-connection-editor.ui:170
 #, fuzzy
 msgid "_Export…"
 msgstr "匯出(_X)"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: src/connection-editor/nm-connection-editor.ui:260
 msgid "File Relabel"
 msgstr "文件Relabel"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
+#: src/connection-editor/nm-connection-editor.ui:291
 msgid "_Relabel"
 msgstr "_Relabel"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: src/connection-editor/nm-connection-editor.ui:320
 msgid ""
 "The following files are not labelled for use with certificate "
 "authentication. Do you wish to adjust the labels?"
 msgstr "以下文件未標記為與證書身份驗證一起使用。你想調整標籤嗎？"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: src/connection-editor/nm-connection-editor.ui:347
 msgid "Relabel"
 msgstr "重新標記"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: src/connection-editor/nm-connection-editor.ui:361
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:148
+#: src/connection-editor/nm-connection-list.c:148
 msgid "never"
 msgstr "永不"
 
-#: ../src/connection-editor/nm-connection-list.c:159
-#: ../src/connection-editor/nm-connection-list.c:170
+#: src/connection-editor/nm-connection-list.c:159
+#: src/connection-editor/nm-connection-list.c:170
 msgid "now"
 msgstr "現在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:177
+#: src/connection-editor/nm-connection-list.c:177
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: src/connection-editor/nm-connection-list.c:181
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../src/connection-editor/nm-connection-list.c:193
+#: src/connection-editor/nm-connection-list.c:193
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:199
+#: src/connection-editor/nm-connection-list.c:199
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:203
+#: src/connection-editor/nm-connection-list.c:203
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:473
+#: src/connection-editor/nm-connection-list.c:473
 msgid "Connection cannot be deleted"
 msgstr "無法刪除連接"
 
-#: ../src/connection-editor/nm-connection-list.c:476
+#: src/connection-editor/nm-connection-list.c:476
 msgid "Select a connection to edit"
 msgstr "選擇要編輯的連接"
 
-#: ../src/connection-editor/nm-connection-list.c:478
+#: src/connection-editor/nm-connection-list.c:478
 msgid "Select a connection to delete"
 msgstr "選擇要刪除的連接"
 
-#: ../src/connection-editor/nm-connection-list.c:794
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:2
+#: src/connection-editor/nm-connection-list.c:794
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:116
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:807
+#: src/connection-editor/nm-connection-list.c:807
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:845
+#: src/connection-editor/nm-connection-list.c:845
 msgid "Edit the selected connection"
 msgstr "編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:846
+#: src/connection-editor/nm-connection-list.c:846
 msgid "Authenticate to edit the selected connection"
 msgstr "驗證以編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:851
+#: src/connection-editor/nm-connection-list.c:851
 msgid "Delete the selected connection"
 msgstr "刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: src/connection-editor/nm-connection-list.c:852
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:1059
-#, fuzzy, c-format
+#: src/connection-editor/nm-connection-list.c:1059
+#, fuzzy
 msgid "Unrecognized connection type"
 msgstr "不支援的行動寬頻連線類型。"
 
-#: ../src/connection-editor/nm-connection-list.c:1064
+#: src/connection-editor/nm-connection-list.c:1064
 #, fuzzy, c-format
 msgid "Don’t know how to import “%s” connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:1068
+#: src/connection-editor/nm-connection-list.c:1068
 #, fuzzy
 msgid "Error importing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
-#: ../src/connection-editor/nm-connection-list.c:1090
-#: ../src/connection-editor/nm-connection-list.c:1093
+#: src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1090
+#: src/connection-editor/nm-connection-list.c:1093
 msgid "Error creating connection"
 msgstr "建立連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:1075
+#: src/connection-editor/nm-connection-list.c:1075
 #, fuzzy
 msgid "Connection type not specified."
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-list.c:1091
+#: src/connection-editor/nm-connection-list.c:1091
 msgid "No VPN plugins are installed."
 msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:1094
+#: src/connection-editor/nm-connection-list.c:1094
 #, fuzzy, c-format
 msgid "Don’t know how to create “%s” connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:1128
+#: src/connection-editor/nm-connection-list.c:1128
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:1129
+#: src/connection-editor/nm-connection-list.c:1129
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID “%s”"
 msgstr "找不到 UUID「%s」的連線"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:1
+#: src/connection-editor/nm-connection-list.ui:7
 msgid "Network Connections"
 msgstr "網路連線"
 
-#: ../src/connection-editor/nm-connection-list.ui.h:2
+#: src/connection-editor/nm-connection-list.ui:86
 msgid "Add a new connection"
 msgstr "添加新連接"
 
-#: ../src/connection-editor/page-8021x-security.c:113
+#: src/connection-editor/page-8021x-security.c:113
 msgid "802.1X Security"
 msgstr "802.1X 防護"
 
-#: ../src/connection-editor/page-8021x-security.c:115
+#: src/connection-editor/page-8021x-security.c:115
 msgid "Could not load 802.1X Security user interface."
 msgstr "無法載入 802.1X 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:129
+#: src/connection-editor/page-8021x-security.c:129
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bluetooth.c:58
+#: src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "藍牙設備的MAC地址。例如：00：11：22：33：44：55"
 
-#: ../src/connection-editor/page-bluetooth.c:122
+#: src/connection-editor/page-bluetooth.c:122
 #, fuzzy
 msgid "Could not load Bluetooth user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-bluetooth.c:170
+#: src/connection-editor/page-bluetooth.c:170
 #, fuzzy, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "找不到藍牙裝置。"
 
-#: ../src/connection-editor/page-bluetooth.c:253
+#: src/connection-editor/page-bluetooth.c:253
 #, fuzzy, c-format
 msgid "Bluetooth connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bluetooth.c:304
+#: src/connection-editor/page-bluetooth.c:304
 #, fuzzy
 msgid "Bluetooth Type"
 msgstr "藍牙"
 
-#: ../src/connection-editor/page-bluetooth.c:322
+#: src/connection-editor/page-bluetooth.c:322
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "選擇藍牙連接配置文件的類型。"
 
-#: ../src/connection-editor/page-bluetooth.c:327
+#: src/connection-editor/page-bluetooth.c:327
 #, fuzzy
 msgid "_Personal Area Network"
 msgstr "有線網路"
 
-#: ../src/connection-editor/page-bluetooth.c:332
+#: src/connection-editor/page-bluetooth.c:332
 #, fuzzy
 msgid "_Dial-Up Network"
 msgstr "Wi-Fi 網路"
 
-#: ../src/connection-editor/page-bond.c:446
+#: src/connection-editor/page-bond.c:446
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:565
+#: src/connection-editor/page-bond.c:565
 msgid "primary"
 msgstr "主要"
 
-#: ../src/connection-editor/page-bond.c:620
+#: src/connection-editor/page-bond.c:620
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:233
+#: src/connection-editor/page-bridge.c:233
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:349
+#: src/connection-editor/page-bridge.c:349
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -3552,36 +3607,36 @@ msgstr "橋接的連線 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:105
+#: src/connection-editor/page-bridge-port.c:105
 msgid "Bridge Port"
 msgstr "橋接連接埠"
 
-#: ../src/connection-editor/page-bridge-port.c:107
+#: src/connection-editor/page-bridge-port.c:107
 msgid "Could not load bridge port user interface."
 msgstr "無法載入橋接連接埠使用者介面。"
 
-#: ../src/connection-editor/page-dcb.c:624
+#: src/connection-editor/page-dcb.c:624
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:626
+#: src/connection-editor/page-dcb.c:626
 msgid "Could not load DCB user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:219
+#: src/connection-editor/page-dsl.c:219
 msgid "Could not load DSL user interface."
 msgstr "無法載入 DSL 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:320
+#: src/connection-editor/page-dsl.c:320
 msgid "missing parent interface"
 msgstr "缺少父接口"
 
-#: ../src/connection-editor/page-dsl.c:365
+#: src/connection-editor/page-dsl.c:365
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
+#: src/connection-editor/page-ethernet.c:81
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3591,44 +3646,43 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:262
+#: src/connection-editor/page-ethernet.c:262
 #, fuzzy
 msgid "ignored"
 msgstr "已忽略"
 
-#: ../src/connection-editor/page-ethernet.c:350
+#: src/connection-editor/page-ethernet.c:350
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網路使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:512
+#: src/connection-editor/page-ethernet.c:512
 #, fuzzy
 msgid "Ethernet device"
 msgstr "有線網路"
 
-#: ../src/connection-editor/page-ethernet.c:516
-#: ../src/connection-editor/page-vlan.c:737
-#: ../src/connection-editor/page-wifi.c:571
+#: src/connection-editor/page-ethernet.c:516
+#: src/connection-editor/page-vlan.c:737 src/connection-editor/page-wifi.c:571
 #, fuzzy
 msgid "cloned MAC"
 msgstr "複製的 MAC 位址(_L)："
 
-#: ../src/connection-editor/page-ethernet.c:520
+#: src/connection-editor/page-ethernet.c:520
 msgid "Wake-on-LAN password"
 msgstr "局域網喚醒密碼"
 
-#: ../src/connection-editor/page-ethernet.c:560
+#: src/connection-editor/page-ethernet.c:560
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "線網路連線 %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:802
-#: ../src/libnm-gtk/nm-mobile-providers.c:801
+#: src/connection-editor/page-general.c:55
+#: src/libnma/nma-mobile-providers.c:802
+#: src/libnm-gtk/nm-mobile-providers.c:801
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:56
+#: src/connection-editor/page-general.c:56
 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 "
@@ -3637,11 +3691,11 @@ msgstr ""
 "定義連線信任等級的地帶。預設值不是正常的地帶，選擇它會直接使用防火牆中預設的"
 "地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:370
+#: src/connection-editor/page-general.c:370
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:57
+#: src/connection-editor/page-infiniband.c:57
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -3652,282 +3706,272 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-infiniband.c:148
+#: src/connection-editor/page-infiniband.c:148
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:211
+#: src/connection-editor/page-infiniband.c:211
 msgid "infiniband device"
 msgstr "infiniband設備"
 
-#: ../src/connection-editor/page-infiniband.c:251
+#: src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
 
-#: ../src/connection-editor/page-ip-tunnel.c:175
+#: src/connection-editor/page-ip-tunnel.c:175
 #, fuzzy
 msgid "Could not load IP tunnel user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip-tunnel.c:289
+#: src/connection-editor/page-ip-tunnel.c:289
 #, fuzzy, c-format
 msgid "IP tunnel connection %d"
 msgstr "線網路連線 %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:137
+#: src/connection-editor/page-ip4.c:128 src/connection-editor/page-ip6.c:137
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:138
+#: src/connection-editor/page-ip4.c:129 src/connection-editor/page-ip6.c:138
 msgid "Automatic (VPN) addresses only"
 msgstr "只用自動 (VPN) 位址"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:144
+#: src/connection-editor/page-ip4.c:133 src/connection-editor/page-ip6.c:144
 msgid "Automatic, addresses only"
 msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:140
+#: src/connection-editor/page-ip4.c:135 src/connection-editor/page-ip6.c:140
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:141
+#: src/connection-editor/page-ip4.c:136 src/connection-editor/page-ip6.c:141
 msgid "Automatic (PPPoE) addresses only"
 msgstr "只用自動 (PPPoE) 位址"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: src/connection-editor/page-ip4.c:139
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:205
+#: src/connection-editor/page-ip4.c:182 src/connection-editor/page-ip6.c:205
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
-#: ../src/connection-editor/page-ip4.c:362
-#: ../src/connection-editor/page-ip6.c:336
+#: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336
 #, fuzzy
 msgid "Additional DNS ser_vers"
 msgstr "額外的 _DNS 伺服器："
 
-#: ../src/connection-editor/page-ip4.c:371
-#: ../src/connection-editor/page-ip6.c:345
+#: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345
 #, fuzzy
 msgid "Additional s_earch domains"
 msgstr "額外的搜尋網域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:1033
+#: src/connection-editor/page-ip4.c:1033
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1223
+#: src/connection-editor/page-ip4.c:1223
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1225
+#: src/connection-editor/page-ip4.c:1225
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip4.c:1318
+#: src/connection-editor/page-ip4.c:1318
 #, c-format
 msgid "IPv4 address “%s” invalid"
 msgstr "IPv4地址“%s“無效"
 
-#: ../src/connection-editor/page-ip4.c:1326
+#: src/connection-editor/page-ip4.c:1326
 #, c-format
 msgid "IPv4 address netmask “%s” invalid"
 msgstr "IPv4地址網絡掩碼“%s“無效"
 
-#: ../src/connection-editor/page-ip4.c:1335
+#: src/connection-editor/page-ip4.c:1335
 #, c-format
 msgid "IPv4 gateway “%s” invalid"
 msgstr "IPv4網關“%s“無效"
 
-#: ../src/connection-editor/page-ip4.c:1378
+#: src/connection-editor/page-ip4.c:1378
 #, c-format
 msgid "IPv4 DNS server “%s” invalid"
 msgstr "IPv4 DNS服務器“%s“無效"
 
-#: ../src/connection-editor/page-ip6.c:180
+#: src/connection-editor/page-ip6.c:180
 msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:1016
+#: src/connection-editor/page-ip6.c:1016
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1205
+#: src/connection-editor/page-ip6.c:1205
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1207
+#: src/connection-editor/page-ip6.c:1207
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
-#: ../src/connection-editor/page-ip6.c:1299
+#: src/connection-editor/page-ip6.c:1299
 #, c-format
 msgid "IPv6 address “%s” invalid"
 msgstr "IPv6地址“%s“無效"
 
-#: ../src/connection-editor/page-ip6.c:1307
+#: src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 prefix “%s” invalid"
 msgstr "IPv6前綴“%s“無效"
 
-#: ../src/connection-editor/page-ip6.c:1316
+#: src/connection-editor/page-ip6.c:1316
 #, c-format
 msgid "IPv6 gateway “%s” invalid"
 msgstr "IPv6網關“%s“無效"
 
-#: ../src/connection-editor/page-ip6.c:1358
+#: src/connection-editor/page-ip6.c:1358
 #, c-format
 msgid "IPv6 DNS server “%s” invalid"
 msgstr "IPv6 DNS服務器“%s“無效"
 
-#: ../src/connection-editor/page-macsec.c:189
+#: src/connection-editor/page-macsec.c:189
 msgid "Could not load MACsec user interface."
 msgstr "無法加載MACsec用戶界面。"
 
-#: ../src/connection-editor/page-macsec.c:328
+#: src/connection-editor/page-macsec.c:328
 #, c-format
 msgid "MACSEC connection %d"
 msgstr "MACSEC連接 %d"
 
-#: ../src/connection-editor/page-master.c:235
-#: ../src/connection-editor/page-master.c:246
+#: src/connection-editor/page-master.c:235
+#: src/connection-editor/page-master.c:246
 msgid "Duplicate slaves"
 msgstr "重製從屬"
 
-#: ../src/connection-editor/page-master.c:236
+#: src/connection-editor/page-master.c:236
 #, fuzzy, c-format
 msgid "Slaves “%s” and “%s” both apply to device “%s”"
 msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
 
-#: ../src/connection-editor/page-master.c:247
+#: src/connection-editor/page-master.c:247
 #, fuzzy, c-format
 msgid ""
 "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the "
 "same physical device."
 msgstr "從屬「%s」與「%s」套用到同個實體裝置不同的虛擬連接埠(「%s」與「%s」)。"
 
-#: ../src/connection-editor/page-master.c:371
+#: src/connection-editor/page-master.c:371
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:307
+#: src/connection-editor/page-mobile.c:307
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入行動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:324
+#: src/connection-editor/page-mobile.c:324
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的行動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:537
+#: src/connection-editor/page-mobile.c:537
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇行動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:564
+#: src/connection-editor/page-mobile.c:564
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses. If you are "
 "unsure, ask your provider."
 msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定，請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:569
+#: src/connection-editor/page-mobile.c:569
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的供應商使用 _GSM 為主的技術（例如 GPRS、EDGE、UMTS、HSDPA）"
 
 #. 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:576
+#: src/connection-editor/page-mobile.c:576
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
 
-#: ../src/connection-editor/page-mobile.c:586
-#: ../src/libnma/nma-mobile-wizard.c:147 ../src/mb-menu-item.c:50
-#: ../src/mobile-helpers.c:282
+#: src/connection-editor/page-mobile.c:586 src/libnma/nma-mobile-wizard.c:148
+#: src/mb-menu-item.c:50 src/mobile-helpers.c:282
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:589
-#: ../src/libnma/nma-mobile-wizard.c:144 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:280
+#: src/connection-editor/page-mobile.c:589 src/libnma/nma-mobile-wizard.c:145
+#: src/mb-menu-item.c:54 src/mobile-helpers.c:280
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:130
-#: ../src/wireless-security/eap-method-ttls.c:288
+#: src/connection-editor/page-ppp.c:130
+#: src/wireless-security/eap-method-ttls.c:288
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:131
-#: ../src/wireless-security/eap-method-ttls.c:354
+#: src/connection-editor/page-ppp.c:131
+#: src/wireless-security/eap-method-ttls.c:354
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:132
-#: ../src/wireless-security/eap-method-fast.c:284
-#: ../src/wireless-security/eap-method-peap.c:300
-#: ../src/wireless-security/eap-method-ttls.c:320
+#: src/connection-editor/page-ppp.c:132
+#: src/wireless-security/eap-method-fast.c:284
+#: src/wireless-security/eap-method-peap.c:300
+#: src/wireless-security/eap-method-ttls.c:320
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: src/connection-editor/page-ppp.c:133
+#: src/wireless-security/eap-method-ttls.c:304
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:136
+#: src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:196
+#: src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "編輯 %s 的 PPP 驗證方法"
 
-#: ../src/connection-editor/page-ppp.c:278
+#: src/connection-editor/page-ppp.c:278
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:280
+#: src/connection-editor/page-ppp.c:280
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-proxy.c:212
+#: src/connection-editor/page-proxy.c:212
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../src/connection-editor/page-proxy.c:214
+#: src/connection-editor/page-proxy.c:214
 #, fuzzy
 msgid "Could not load proxy user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-team.c:361
-#: ../src/connection-editor/page-team-port.c:223
+#: src/connection-editor/page-team.c:361
+#: src/connection-editor/page-team-port.c:223
 #, fuzzy
 msgid "Error: file doesn’t contain a valid JSON configuration"
 msgstr "錯誤：檔案不含有效的 JSON 組態"
 
-#: ../src/connection-editor/page-team.c:1031
+#: src/connection-editor/page-team.c:1031
 msgid "Could not load team user interface."
 msgstr "無法載入團隊使用者介面。"
 
-#: ../src/connection-editor/page-team.c:1128
+#: src/connection-editor/page-team.c:1128
 #, c-format
 msgid "Team connection %d"
 msgstr "團隊連線 %d"
@@ -3935,69 +3979,69 @@ msgstr "團隊連線 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:652
+#: src/connection-editor/page-team-port.c:652
 msgid "Team Port"
 msgstr "團隊連接埠"
 
-#: ../src/connection-editor/page-team-port.c:654
+#: src/connection-editor/page-team-port.c:654
 msgid "Could not load team port user interface."
 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:413
+#: src/connection-editor/page-vlan.c:413
 #, fuzzy, c-format
 msgid "%s (via “%s”)"
 msgstr "%s (經由「%s」)"
 
-#: ../src/connection-editor/page-vlan.c:425
-#, fuzzy, c-format
+#: src/connection-editor/page-vlan.c:425
+#, fuzzy
 msgid "New connection…"
 msgstr "沒有網路連接"
 
-#: ../src/connection-editor/page-vlan.c:591
+#: src/connection-editor/page-vlan.c:591
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:730
+#: src/connection-editor/page-vlan.c:730
 msgid "vlan parent"
 msgstr "vlan的父母"
 
-#: ../src/connection-editor/page-vlan.c:798
+#: src/connection-editor/page-vlan.c:798
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:64
+#: src/connection-editor/page-vpn.c:64
 #, fuzzy, c-format
 msgid "Could not load editor VPN plugin for “%s” (%s)."
 msgstr "找不到「%s」的 VPN 外掛程式服務。"
 
-#: ../src/connection-editor/page-vpn.c:65
+#: src/connection-editor/page-vpn.c:65
 #, fuzzy
 msgid "unknown failure"
 msgstr "連線失敗"
 
-#: ../src/connection-editor/page-vpn.c:102
+#: src/connection-editor/page-vpn.c:102
 msgid "Could not load VPN user interface."
 msgstr "無法載入 VPN 使用者介面。"
 
-#: ../src/connection-editor/page-vpn.c:117
+#: src/connection-editor/page-vpn.c:117
 #, fuzzy, c-format
 msgid "Could not find VPN plugin for “%s”."
 msgstr "找不到「%s」的 VPN 外掛程式服務。"
 
-#: ../src/connection-editor/page-vpn.c:199
+#: src/connection-editor/page-vpn.c:199
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:205
+#: src/connection-editor/page-vpn.c:205
 msgid "Choose a VPN Connection Type"
 msgstr "請選擇 VPN 的連線類型"
 
-#: ../src/connection-editor/page-vpn.c:206
+#: src/connection-editor/page-vpn.c:206
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection. If the type "
@@ -4007,7 +4051,7 @@ msgstr ""
 "選擇您想要用在新連線中的 VPN 類型。如果您想要建立的 VPN 連線類型沒有出現在清"
 "單中，可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:77
+#: src/connection-editor/page-wifi.c:77
 #, fuzzy
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
@@ -4016,7 +4060,7 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點（AP）。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:88
+#: src/connection-editor/page-wifi.c:88
 #, fuzzy
 msgid ""
 "This option locks this connection to the network device specified either by "
@@ -4026,94 +4070,92 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:197
+#: src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:439
+#: src/connection-editor/page-wifi.c:439
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:561
+#: src/connection-editor/page-wifi.c:561
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:567
+#: src/connection-editor/page-wifi.c:567
 #, fuzzy
 msgid "Wi-Fi device"
 msgstr "任何裝置"
 
-#: ../src/connection-editor/page-wifi.c:614
+#: src/connection-editor/page-wifi.c:614
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:355
-#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:922
+#: src/connection-editor/page-wifi-security.c:355
+#: src/libnma/nma-wifi-dialog.c:946 src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-位元 金鑰 (Hex 或 ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:365
-#: ../src/libnma/nma-wifi-dialog.c:955 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: src/connection-editor/page-wifi-security.c:365
+#: src/libnma/nma-wifi-dialog.c:955 src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: src/connection-editor/page-wifi-security.c:391
 msgid "Dynamic WEP (802.1X)"
 msgstr "動態 WEP (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#: ../src/libnma/nma-wifi-dialog.c:999 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#: src/connection-editor/page-wifi-security.c:404
+#: src/libnma/nma-wifi-dialog.c:999 src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: ../src/connection-editor/page-wifi-security.c:417
-#: ../src/libnma/nma-wifi-dialog.c:1017 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#: src/connection-editor/page-wifi-security.c:417
+#: src/libnma/nma-wifi-dialog.c:1017 src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../src/connection-editor/page-wifi-security.c:460
+#: src/connection-editor/page-wifi-security.c:460
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "無法載入 Wi-Fi 安全性使用者介面；失去 Wi-Fi 設定值。"
 
-#: ../src/connection-editor/page-wifi-security.c:471
+#: src/connection-editor/page-wifi-security.c:471
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:473
+#: src/connection-editor/page-wifi-security.c:473
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wifi-security.c:557
-#, c-format
+#: src/connection-editor/page-wifi-security.c:557
 msgid "missing SSID"
 msgstr "缺少SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:563
-#, c-format
+#: src/connection-editor/page-wifi-security.c:563
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "安全性與Ad-Hoc模式不兼容"
 
-#: ../src/connection-editor/vpn-helpers.c:132
+#: src/connection-editor/vpn-helpers.c:132
 #, fuzzy, c-format
 msgid "A file named “%s” already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:134
+#: src/connection-editor/vpn-helpers.c:134
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:136
+#: src/connection-editor/vpn-helpers.c:136
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "您是否要以準備儲存的 VPN 連線取代 %s？"
 
-#: ../src/connection-editor/vpn-helpers.c:172
+#: src/connection-editor/vpn-helpers.c:172
 msgid "Cannot export VPN connection"
 msgstr "不能匯出 VPN 連線"
 
-#: ../src/connection-editor/vpn-helpers.c:174
+#: src/connection-editor/vpn-helpers.c:174
 #, fuzzy, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -4124,204 +4166,177 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: src/connection-editor/vpn-helpers.c:209
 #, fuzzy
 msgid "Export VPN connection…"
 msgstr "匯出 VPN 連線…"
 
-#: ../src/gsm-unlock.ui.h:2
+#: src/gsm-unlock.ui:42
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
-#: ../src/gsm-unlock.ui.h:3
+#: src/gsm-unlock.ui:253
 msgid "Automatically unlock this device"
 msgstr "自動解鎖這個裝置"
 
-#: ../src/info.ui.h:1
+#: src/info.ui:9
 msgid "Connection Information"
 msgstr "連線資訊"
 
 # translation auto-copied from project subscription-manager, version 1.11.X, document keys
-#: ../src/info.ui.h:2
+#: src/info.ui:30
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/info.ui.h:3
-msgid "Active Network Connections"
-msgstr "啟用網路連線"
+#: src/libnma/nma-bar-code-widget.ui:36
+msgid "Scan with your phone or <a href=\"nma:print\">Print</a>"
+msgstr ""
 
-#: ../src/libnma/nma-file-cert-chooser.c:108
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:152
+#: src/libnma/nma-file-cert-chooser.c:108
+#: src/libnma/nma-pkcs11-cert-chooser.c:152
 #, fuzzy
 msgid "No certificate set"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/libnma/nma-file-cert-chooser.c:126
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:176
+#: src/libnma/nma-file-cert-chooser.c:126
+#: src/libnma/nma-pkcs11-cert-chooser.c:176
 msgid "No key set"
 msgstr "沒有按鍵設置"
 
-#: ../src/libnma/nma-file-cert-chooser.c:246
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:382
+#: src/libnma/nma-file-cert-chooser.c:246
+#: src/libnma/nma-pkcs11-cert-chooser.c:382
 #, fuzzy, c-format
 msgid "Choose a key for %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-file-cert-chooser.c:250
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:386
+#: src/libnma/nma-file-cert-chooser.c:250
+#: src/libnma/nma-pkcs11-cert-chooser.c:386
 #, fuzzy, c-format
 msgid "%s private _key"
 msgstr "私密金鑰(_K)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:254
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:390
+#: src/libnma/nma-file-cert-chooser.c:254
+#: src/libnma/nma-pkcs11-cert-chooser.c:390
 #, fuzzy, c-format
 msgid "%s key _password"
 msgstr "私密金鑰密碼(_P)："
 
-#: ../src/libnma/nma-file-cert-chooser.c:258
+#: src/libnma/nma-file-cert-chooser.c:258
 #, fuzzy, c-format
 msgid "Choose %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-file-cert-chooser.c:262
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:398
+#: src/libnma/nma-file-cert-chooser.c:262
+#: src/libnma/nma-pkcs11-cert-chooser.c:398
 #, fuzzy, c-format
 msgid "%s _certificate"
 msgstr "使用者憑證(_U)："
 
-#: ../src/libnma/nma-mobile-providers.c:991
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
+#: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: ../src/libnma/nma-mobile-wizard.c:252 ../src/libnma/nma-mobile-wizard.c:284
-#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+#: src/libnma/nma-mobile-wizard.c:253 src/libnma/nma-mobile-wizard.c:285
+#: src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnma/nma-mobile-wizard.c:484
-#: ../src/libnm-gtk/nm-mobile-wizard.c:558
+#: src/libnma/nma-mobile-wizard.c:485 src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed…"
 msgstr "我的方案沒有列出…"
 
-#: ../src/libnma/nma-mobile-wizard.c:644
-#: ../src/libnm-gtk/nm-mobile-wizard.c:724
+#: src/libnma/nma-mobile-wizard.c:657 src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnma/nma-mobile-wizard.c:932
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
-msgid "Country or region"
-msgstr "國家或地區"
-
-#: ../src/libnma/nma-mobile-wizard.c:1016
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
+#: src/libnma/nma-mobile-wizard.c:1029 src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnma/nma-mobile-wizard.c:1019
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
+#: src/libnma/nma-mobile-wizard.c:1032 src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnma/nma-mobile-wizard.c:1225
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: src/libnma/nma-mobile-wizard.c:1237 src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "任何裝置"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:1
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#: src/libnma/nma-mobile-wizard.ui:49 src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新的行動寬頻連線"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:2
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
+#: src/libnma/nma-mobile-wizard.ui:72 src/libnm-gtk/nm-mobile-wizard.c:1355
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "這能幫助您輕易地設定行動寬頻連線，連至手機 (3G) 網路。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:3
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: src/libnma/nma-mobile-wizard.ui:87 src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "您需要以下資訊："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:4
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+#: src/libnma/nma-mobile-wizard.ui:102 src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider’s name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:5
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+#: src/libnma/nma-mobile-wizard.ui:116 src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費方案的名稱"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:6
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1384
+#: src/libnma/nma-mobile-wizard.ui:130 src/libnm-gtk/nm-mobile-wizard.c:1384
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr "（在有些情況下）您的寬頻計費方案的 APN（存取點名稱）"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:7
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1413
+#: src/libnma/nma-mobile-wizard.ui:144 src/libnm-gtk/nm-mobile-wizard.c:1413
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "為這個行動寬頻裝置建立連線(_T)"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:8
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: src/libnma/nma-mobile-wizard.ui:171 src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定行動寬頻連線"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:9
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
-msgid "Country or Region List:"
-msgstr "國家或地區清單："
+#: src/libnma/nma-mobile-wizard.ui:189
+#, fuzzy
+msgid "Country or region:"
+msgstr "國家或地區"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:10
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
+#: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127
 #, fuzzy
 msgid "Choose your Provider’s Country or Region"
 msgstr "選擇您的供應商的國家或地區"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:11
-#: ../src/libnm-gtk/nm-mobile-wizard.c:711
+#: src/libnma/nma-mobile-wizard.ui:244 src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "請從清單裡選擇供應商(_L)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:12
+#: src/libnma/nma-mobile-wizard.ui:289
 #, fuzzy
 msgid "I can’t find my provider and I wish to set up the connection _manually:"
 msgstr "我找不到我的供應商，我想要手動輸入(_M)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:13
-#: ../src/libnm-gtk/nm-mobile-wizard.c:779
+#: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "我的供應商使用 GSM 技術（GPRS、EDGE、UMTS、HSPA）"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:14
-#: ../src/libnm-gtk/nm-mobile-wizard.c:781
+#: src/libnma/nma-mobile-wizard.ui:311 src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "我的供應商使用 CDMA 技術（1xRTT、EVDO）"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:15
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: src/libnma/nma-mobile-wizard.ui:322 src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "選擇您的供應商"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:16
-#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+#: src/libnma/nma-mobile-wizard.ui:339 src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "選擇您的方案(_S)："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:17
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: src/libnma/nma-mobile-wizard.ui:366 src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "選擇方案的 _APN（Access Point Name，存取點名稱）："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:18
-#: ../src/libnm-gtk/nm-mobile-wizard.c:501
+#: src/libnma/nma-mobile-wizard.ui:416 src/libnm-gtk/nm-mobile-wizard.c:501
 #, fuzzy
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
@@ -4333,37 +4348,31 @@ msgstr ""
 "\n"
 "如果您不確定所使用的方案，請洽詢供應商，以得知方案的 APN 為何。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:21
-#: ../src/libnm-gtk/nm-mobile-wizard.c:509
+#: src/libnma/nma-mobile-wizard.ui:437 src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "選擇您的計費方案"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:22
-#: ../src/libnm-gtk/nm-mobile-wizard.c:199
+#: src/libnma/nma-mobile-wizard.ui:455 src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "行動寬連線已經配置了以下設定："
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.ui.h:23
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: src/libnma/nma-mobile-wizard.ui:469 src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "您的裝置："
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.ui.h:24
-#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+#: src/libnma/nma-mobile-wizard.ui:495 src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "您的供應商："
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.ui.h:25
-#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+#: src/libnma/nma-mobile-wizard.ui:521 src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "您的方案："
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:26
-#: ../src/libnm-gtk/nm-mobile-wizard.c:249
+#: src/libnma/nma-mobile-wizard.ui:576 src/libnm-gtk/nm-mobile-wizard.c:249
 #, fuzzy
 msgid ""
 "A connection will now be made to your mobile broadband provider using the "
@@ -4376,228 +4385,235 @@ msgstr ""
 "無法存取網路資源，請檢查設定。要修改行動寬頻連線的設定，請從「系統」 >> 「偏"
 "好設定」中，選擇「網路連線」。"
 
-#: ../src/libnma/nma-mobile-wizard.ui.h:27
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: src/libnma/nma-mobile-wizard.ui:590 src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認行動寬頻設定"
 
-#: ../src/libnma/nma-cert-chooser-button.c:167
+#: src/libnma/nma-cert-chooser-button.c:167
 msgid "(None)"
 msgstr "（無）"
 
-#: ../src/libnma/nma-cert-chooser-button.c:175
+#: src/libnma/nma-cert-chooser-button.c:175
 #, c-format
 msgid "Key in %s"
 msgstr "鍵入 %s"
 
-#: ../src/libnma/nma-cert-chooser-button.c:176
+#: src/libnma/nma-cert-chooser-button.c:176
 #, fuzzy, c-format
 msgid "Certificate in %s"
 msgstr "C_A 憑證："
 
-#: ../src/libnma/nma-cert-chooser-button.c:195
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
+#: src/libnma/nma-cert-chooser-button.c:195
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:183
 msgid "(Unknown)"
 msgstr "（不明）"
 
-#: ../src/libnma/nma-cert-chooser-button.c:217
-#: ../src/libnma/nma-cert-chooser-button.c:247
+#: src/libnma/nma-cert-chooser-button.c:217
+#: src/libnma/nma-cert-chooser-button.c:247
 msgid "Select"
 msgstr "選擇"
 
-#: ../src/libnma/nma-cert-chooser-button.c:218
-#: ../src/libnma/nma-cert-chooser-button.c:248
+#: src/libnma/nma-cert-chooser-button.c:218
+#: src/libnma/nma-cert-chooser-button.c:248
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/libnma/nma-cert-chooser-button.c:474
+#: src/libnma/nma-cert-chooser-button.c:474
 msgid "Select from file…"
 msgstr "從文件中選擇..."
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:394
+#: src/libnma/nma-pkcs11-cert-chooser.c:394
 #, fuzzy, c-format
 msgid "Choose a %s Certificate"
 msgstr "選擇 CA 憑證"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser.c:402
+#: src/libnma/nma-pkcs11-cert-chooser.c:402
 #, fuzzy, c-format
 msgid "%s certificate _password"
 msgstr "使用者憑證(_U)："
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255
 msgid "Error logging in: "
 msgstr "登錄時出錯： "
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.c:277
 #, fuzzy
 msgid "Error opening a session: "
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:1
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:20
 #, fuzzy
 msgid "_Unlock token"
 msgstr "解鎖(_U)"
 
-#: ../src/libnma/nma-pkcs11-cert-chooser-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-cert-chooser-dialog.ui:126
 msgid "Issued By"
 msgstr "由...發出"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.c:146
+#: src/libnma/nma-pkcs11-token-login-dialog.c:146
 #, c-format
 msgid "Enter %s PIN"
 msgstr "輸入 %s 銷"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:2
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:35
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../src/libnma/nma-pkcs11-token-login-dialog.ui.h:3
+#: src/libnma/nma-pkcs11-token-login-dialog.ui:82
 msgid "_Remember PIN"
 msgstr "_記住密碼"
 
-#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+#: src/libnma/nma-ui-utils.c:49 src/libnm-gtk/nm-ui-utils.c:615
 #, fuzzy
 msgid "Store the password only for this user"
 msgstr "只儲存這個使用者的密碼(_U)"
 
-#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#: src/libnma/nma-ui-utils.c:50 src/libnm-gtk/nm-ui-utils.c:616
 #, fuzzy
 msgid "Store the password for all users"
 msgstr "儲存所有使用者的密碼(_A)"
 
-#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#: src/libnma/nma-ui-utils.c:51 src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "每次都詢問此密碼"
 
-#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#: src/libnma/nma-ui-utils.c:52 src/libnm-gtk/nm-ui-utils.c:618
 #, fuzzy
 msgid "The password is not required"
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:3
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:238
+#: src/libnma/nma-vpn-password-dialog.ui:73
+#: src/libnm-gtk/nm-vpn-password-dialog.c:238
 msgid "Sh_ow passwords"
 msgstr "顯示密碼(_O)"
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: src/libnma/nma-vpn-password-dialog.ui:130
+#: src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
 msgid "_Tertiary Password:"
 msgstr "第二密碼(_S)："
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:5
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#: src/libnma/nma-vpn-password-dialog.ui:144
+#: src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "第二密碼(_S)："
 
-#: ../src/libnma/nma-vpn-password-dialog.ui.h:6
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: src/libnma/nma-vpn-password-dialog.ui:158
+#: src/libnm-gtk/nm-vpn-password-dialog.c:97
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: ../src/libnma/nma-wifi-dialog.c:127 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#: src/libnma/nma-wifi-dialog.c:127 src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
 msgid "Click to connect"
 msgstr "斷線"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:465
+#: src/libnma/nma-wifi-dialog.c:458 src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New…"
 msgstr "新…"
 
-#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#: src/libnma/nma-wifi-dialog.c:929 src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/libnma/nma-wifi-dialog.c:985 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#: src/libnma/nma-wifi-dialog.c:985 src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "動態 WEP（802.1x）"
 
-#: ../src/libnma/nma-wifi-dialog.c:1108 ../src/libnm-gtk/nm-wifi-dialog.c:1071
+#: src/libnma/nma-wifi-dialog.c:1108 src/libnm-gtk/nm-wifi-dialog.c:1071
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/libnma/nma-wifi-dialog.c:1186 ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: src/libnma/nma-wifi-dialog.c:1186 src/libnm-gtk/nm-wifi-dialog.c:1150
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network “%s”."
 msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1188 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: src/libnma/nma-wifi-dialog.c:1188 src/libnm-gtk/nm-wifi-dialog.c:1152
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1190 ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: src/libnma/nma-wifi-dialog.c:1190 src/libnm-gtk/nm-wifi-dialog.c:1154
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnma/nma-wifi-dialog.c:1195 ../src/libnm-gtk/nm-wifi-dialog.c:1159
+#: src/libnma/nma-wifi-dialog.c:1195 src/libnm-gtk/nm-wifi-dialog.c:1159
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1197 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#: src/libnma/nma-wifi-dialog.c:1197 src/libnm-gtk/nm-wifi-dialog.c:1161
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1198 ../src/libnm-gtk/nm-wifi-dialog.c:1162
+#: src/libnma/nma-wifi-dialog.c:1198 src/libnm-gtk/nm-wifi-dialog.c:1162
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
 
-#: ../src/libnma/nma-wifi-dialog.c:1200 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: src/libnma/nma-wifi-dialog.c:1200 src/libnm-gtk/nm-wifi-dialog.c:1164
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1202 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: src/libnma/nma-wifi-dialog.c:1202 src/libnm-gtk/nm-wifi-dialog.c:1166
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網路"
 
-#: ../src/libnma/nma-wifi-dialog.c:1203 ../src/libnm-gtk/nm-wifi-dialog.c:1167
+#: src/libnma/nma-wifi-dialog.c:1203 src/libnm-gtk/nm-wifi-dialog.c:1167
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
 
-#: ../src/libnma/wifi.ui.h:1
+#: src/libnma/wifi.ui:97
 #, fuzzy
 msgid "Wi-Fi _security"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnma/wifi.ui.h:3
+#: src/libnma/wifi.ui:154
 #, fuzzy
 msgid "C_onnection"
 msgstr "連線(_N)："
 
-#: ../src/libnma/wifi.ui.h:4
+#: src/libnma/wifi.ui:179
 #, fuzzy
 msgid "Wi-Fi _adapter"
 msgstr "Wi-Fi 介面卡(_A)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:749
+#: src/libnm-gtk/nm-mobile-wizard.c:749
 #, fuzzy
 msgid "I can’t find my provider and I wish to enter it _manually:"
 msgstr "我找不到我的供應商，我想要手動輸入(_M)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:762
+#: src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "供應商："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+#: src/libnm-gtk/nm-mobile-wizard.c:1054
+msgid "Country or Region List:"
+msgstr "國家或地區清單："
+
+#: src/libnm-gtk/nm-mobile-wizard.c:1067
+msgid "Country or region"
+msgstr "國家或地區"
+
+#: src/libnm-gtk/nm-ui-utils.c:302 src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "有線"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
+#: src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:341
+#: src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
+#: src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:406
+#: src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -4607,13 +4623,13 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:482 ../src/libnm-gtk/nm-ui-utils.c:502
+#: src/libnm-gtk/nm-ui-utils.c:482 src/libnm-gtk/nm-ui-utils.c:502
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:142
+#: src/libnm-gtk/nm-wifi-dialog.c:142
 msgid ""
 "Either a password is missing or the connection is invalid. In the latter "
 "case, you have to edit the connection with nm-connection-editor first"
@@ -4621,27 +4637,27 @@ msgstr ""
 "密碼丟失或連接無效。在後一種情況下，您必須首先使用nm-connection-editor編輯連"
 "接"
 
-#: ../src/libnm-gtk/wifi.ui.h:1
+#: src/libnm-gtk/wifi.ui:97
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: src/libnm-gtk/wifi.ui:129
 msgid "_Network name:"
 msgstr "網路名稱(_N)："
 
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: src/libnm-gtk/wifi.ui:154
 msgid "C_onnection:"
 msgstr "連線(_N)："
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: src/libnm-gtk/wifi.ui:179
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi 介面卡(_A)："
 
-#: ../src/main.c:42
+#: src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:44
+#: src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -4649,359 +4665,357 @@ msgstr ""
 "本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的"
 "元件"
 
-#: ../src/main.c:45
+#: src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "用來在 GNOME 桌面環境下運行，而不是使用命令列。"
 
-#: ../src/mb-menu-item.c:52
+#: src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:56
+#: src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:58
+#: src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:60
+#: src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:62
+#: src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:64
+#: src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:66
+#: src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:68
+#: src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:70
+#: src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:117
+#: src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未啟用"
 
-#: ../src/mb-menu-item.c:123
+#: src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未註冊"
 
-#: ../src/mb-menu-item.c:141
+#: src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家用網路（%s）"
 
-#: ../src/mb-menu-item.c:143
-#, c-format
+#: src/mb-menu-item.c:143
 msgid "Home network"
 msgstr "家用網路"
 
-#: ../src/mb-menu-item.c:151
+#: src/mb-menu-item.c:151
 msgid "searching"
 msgstr "搜尋中"
 
-#: ../src/mb-menu-item.c:154
+#: src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "註冊被拒"
 
-#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
+#: src/mb-menu-item.c:159 src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s 漫遊)"
 
-#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#: src/mb-menu-item.c:161 src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s（漫遊）"
 
-#: ../src/mb-menu-item.c:170
+#: src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫遊網路（%s）"
 
-#: ../src/mb-menu-item.c:172
-#, c-format
+#: src/mb-menu-item.c:172
 msgid "Roaming network"
 msgstr "漫遊網路"
 
-#: ../src/mobile-helpers.c:330
+#: src/mobile-helpers.c:330
 #, fuzzy, c-format
 msgid "PIN code for SIM card “%s” on “%s”"
 msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
 
-#: ../src/mobile-helpers.c:463
+#: src/mobile-helpers.c:463
 msgid "PIN code required"
 msgstr "需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:471
+#: src/mobile-helpers.c:471
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "這個行動寬頻裝置需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:621
+#: src/mobile-helpers.c:621
 #, fuzzy, c-format
 msgid "Mobile broadband connection “%s” active: (%d%%%s%s)"
 msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:624
+#: src/mobile-helpers.c:624
 msgid "roaming"
 msgstr "漫遊"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: src/utils/utils.c:184
 #, c-format
 msgid "%s connection"
 msgstr "%s 連線"
 
-#: ../src/utils/utils.c:549
+#: src/utils/utils.c:549
 #, fuzzy
 msgid "PEM certificates (*.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/utils/utils.c:561
+#: src/utils/utils.c:561
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER、PEM 或是 PKCS#12 私人金鑰 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:57
+#: src/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "802.1X安全性中的未定義錯誤（wpa-eap）"
 
-#: ../src/wireless-security/eap-method.c:365
+#: src/wireless-security/eap-method.c:365
 #, fuzzy
 msgid "no CA certificate selected"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method.c:370
+#: src/wireless-security/eap-method.c:370
 msgid "selected CA certificate file does not exist"
 msgstr "選定的CA證書文件不存在"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: src/wireless-security/eap-method-fast.c:71
 msgid "missing EAP-FAST PAC file"
 msgstr "缺少EAP-FAST PAC文件"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:332
-#: ../src/wireless-security/eap-method-ttls.c:386
+#: src/wireless-security/eap-method-fast.c:268
+#: src/wireless-security/eap-method-peap.c:332
+#: src/wireless-security/eap-method-ttls.c:386
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: src/wireless-security/eap-method-fast.c:407
 #, fuzzy
 msgid "Choose a PAC file"
 msgstr "選擇一個 PAC 檔案…"
 
-#: ../src/wireless-security/eap-method-fast.c:414
+#: src/wireless-security/eap-method-fast.c:414
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:418
+#: src/wireless-security/eap-method-fast.c:418
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: src/wireless-security/eap-method-fast.ui:23
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
+#: src/wireless-security/eap-method-fast.ui:26
 msgid "Authenticated"
 msgstr "已驗證"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
+#: src/wireless-security/eap-method-fast.ui:29
 msgid "Both"
 msgstr "兩者"
 
-#: ../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:3
+#: src/wireless-security/eap-method-fast.ui:48
+#: src/wireless-security/eap-method-peap.ui:48
+#: src/wireless-security/eap-method-ttls.ui:118
 #, fuzzy
 msgid "Anony_mous identity"
 msgstr "匿名識別(_M)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: src/wireless-security/eap-method-fast.ui:74
 #, fuzzy
 msgid "PAC _file"
 msgstr "PAC 檔案(_F)："
 
-#: ../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:1
+#: src/wireless-security/eap-method-fast.ui:113
+#: src/wireless-security/eap-method-peap.ui:120
+#: src/wireless-security/eap-method-ttls.ui:77
 #, fuzzy
 msgid "_Inner authentication"
 msgstr "內部驗證(_I)："
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: src/wireless-security/eap-method-fast.ui:142
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: ../src/wireless-security/eap-method-leap.c:66
+#: src/wireless-security/eap-method-leap.c:66
 msgid "missing EAP-LEAP username"
 msgstr "缺少EAP-LEAP用戶名"
 
-#: ../src/wireless-security/eap-method-leap.c:75
+#: src/wireless-security/eap-method-leap.c:75
 msgid "missing EAP-LEAP password"
 msgstr "缺少EAP-LEAP密碼"
 
-#: ../src/wireless-security/eap-method-peap.c:316
-#: ../src/wireless-security/eap-method-ttls.c:370
-#: ../src/wireless-security/wireless-security.c:425
+#: src/wireless-security/eap-method-peap.c:316
+#: src/wireless-security/eap-method-ttls.c:370
+#: src/wireless-security/wireless-security.c:425
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:26
 msgid "Version 0"
 msgstr "版本 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: src/wireless-security/eap-method-peap.ui:29
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
+#: src/wireless-security/eap-method-peap.ui:72
+#: src/wireless-security/eap-method-tls.ui:44
+#: src/wireless-security/eap-method-ttls.ui:88
 msgid "No CA certificate is _required"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: src/wireless-security/eap-method-peap.ui:89
 #, fuzzy
 msgid "PEAP _version"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: src/wireless-security/eap-method-peap.ui:166
+#: src/wireless-security/eap-method-tls.ui:62
+#: src/wireless-security/eap-method-ttls.ui:132
 msgid "Suffix of the server certificate name."
 msgstr "服務器證書名稱的後綴。"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:9
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#: src/wireless-security/eap-method-peap.ui:167
+#: src/wireless-security/eap-method-tls.ui:63
+#: src/wireless-security/eap-method-ttls.ui:133
 msgid "_Domain"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:90
+#: src/wireless-security/eap-method-simple.c:90
 msgid "missing EAP username"
 msgstr "缺少EAP用戶名"
 
-#: ../src/wireless-security/eap-method-simple.c:106
+#: src/wireless-security/eap-method-simple.c:106
 msgid "missing EAP password"
 msgstr "缺少EAP密碼"
 
-#: ../src/wireless-security/eap-method-simple.c:120
+#: src/wireless-security/eap-method-simple.c:120
 msgid "missing EAP client Private Key passphrase"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: src/wireless-security/eap-method-simple.ui:103
 #, fuzzy
 msgid "P_rivate Key Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:5
+#: src/wireless-security/eap-method-simple.ui:128
 #, fuzzy
 msgid "Sh_ow passphrase"
 msgstr "顯示密碼(_O)"
 
-#: ../src/wireless-security/eap-method-tls.c:64
+#: src/wireless-security/eap-method-tls.c:64
 msgid "missing EAP-TLS identity"
 msgstr "缺少EAP-TLS身份"
 
-#: ../src/wireless-security/eap-method-tls.c:256
+#: src/wireless-security/eap-method-tls.c:256
 #, fuzzy
 msgid "no user certificate selected"
 msgstr "不需要 CA 憑證(_R)"
 
-#: ../src/wireless-security/eap-method-tls.c:261
+#: src/wireless-security/eap-method-tls.c:261
 msgid "selected user certificate file does not exist"
 msgstr "選定的用戶證書文件不存在"
 
-#: ../src/wireless-security/eap-method-tls.c:281
+#: src/wireless-security/eap-method-tls.c:281
 msgid "no key selected"
 msgstr "沒有選擇密鑰"
 
-#: ../src/wireless-security/eap-method-tls.c:286
+#: src/wireless-security/eap-method-tls.c:286
 msgid "selected key file does not exist"
 msgstr "選定的密鑰文件不存在"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: src/wireless-security/eap-method-tls.ui:20
 #, fuzzy
 msgid "I_dentity"
 msgstr "識別(_D)："
 
-#: ../src/wireless-security/eap-method-ttls.c:337
+#: src/wireless-security/eap-method-ttls.c:337
 #, fuzzy
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2"
 
-#: ../src/wireless-security/wireless-security.c:72
+#: src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1X security"
 msgstr "驗證802.1X安全性的未知錯誤"
 
-#: ../src/wireless-security/wireless-security.c:437
+#: src/wireless-security/wireless-security.c:437
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:461
+#: src/wireless-security/wireless-security.c:461
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:472
+#: src/wireless-security/wireless-security.c:472
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:483
+#: src/wireless-security/wireless-security.c:483
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:494
+#: src/wireless-security/wireless-security.c:494
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:523
+#: src/wireless-security/wireless-security.c:523
 msgid "Externally configured"
 msgstr ""
 
-#: ../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
+#: src/wireless-security/ws-dynamic-wep.ui:31
+#: src/wireless-security/ws-wep-key.ui:97
+#: src/wireless-security/ws-wpa-eap.ui:31
 #, fuzzy
 msgid "Au_thentication"
 msgstr "驗證(_E)："
 
-#: ../src/wireless-security/ws-leap.c:64
+#: src/wireless-security/ws-leap.c:64
 msgid "missing leap-username"
 msgstr "缺少leap-username"
 
-#: ../src/wireless-security/ws-leap.c:82
+#: src/wireless-security/ws-leap.c:82
 msgid "missing leap-password"
 msgstr "缺少飛躍密碼"
 
-#: ../src/wireless-security/ws-wep-key.c:113
+#: src/wireless-security/ws-wep-key.c:113
 msgid "missing wep-key"
 msgstr "缺少wep-key"
 
-#: ../src/wireless-security/ws-wep-key.c:120
+#: src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr "無效的wep-key：密鑰長度為 %zu 必須只包含十六進制數字"
 
-#: ../src/wireless-security/ws-wep-key.c:128
+#: src/wireless-security/ws-wep-key.c:128
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr "無效的wep-key：密鑰長度為 %zu 必須只包含ascii字符"
 
-#: ../src/wireless-security/ws-wep-key.c:134
+#: src/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -5009,41 +5023,41 @@ msgid ""
 msgstr ""
 "無效的wep-key：錯誤的密鑰長度 %zu。密鑰長度必須為5/13（ascii）或10/26（hex）"
 
-#: ../src/wireless-security/ws-wep-key.c:141
+#: src/wireless-security/ws-wep-key.c:141
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "無效的wep-key：passphrase必須是非空的"
 
-#: ../src/wireless-security/ws-wep-key.c:143
+#: src/wireless-security/ws-wep-key.c:143
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "無效的wep-key：passphrase必須短於64個字符"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
+#: src/wireless-security/ws-wep-key.ui:12
 msgid "Open System"
 msgstr "開放系統"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
+#: src/wireless-security/ws-wep-key.ui:15
 msgid "Shared Key"
 msgstr "共享金鑰"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: src/wireless-security/ws-wep-key.ui:26
 msgid "1 (Default)"
 msgstr "1 (預設值)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: src/wireless-security/ws-wep-key.ui:54
 #, fuzzy
 msgid "_Key"
 msgstr "金鑰(_K)："
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: src/wireless-security/ws-wep-key.ui:80
 msgid "Sho_w key"
 msgstr "顯示金鑰(_W)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: src/wireless-security/ws-wep-key.ui:129
 #, fuzzy
 msgid "WEP inde_x"
 msgstr "WEP 索引(_X)："
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: src/wireless-security/ws-wpa-psk.c:76
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -5051,15 +5065,24 @@ msgid ""
 msgstr ""
 "無效的wpa-psk：無效的密鑰長度 %zu。必須是[8,63]個字節或64個十六進制數字"
 
-#: ../src/wireless-security/ws-wpa-psk.c:83
+#: src/wireless-security/ws-wpa-psk.c:83
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "無效的wpa-psk：無法將64字節的密鑰解釋為十六進制"
 
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#: src/wireless-security/ws-wpa-psk.ui:48
 #, fuzzy
 msgid "_Type"
 msgstr "類型(_T)："
 
+#~ msgid "%s (default)"
+#~ msgstr "%s (預設值)"
+
+#~ msgid "Ignored"
+#~ msgstr "已忽略"
+
+#~ msgid "Active Network Connections"
+#~ msgstr "啟用網路連線"
+
 #~ msgid "Failed to update connection secrets due to an unknown error."
 #~ msgstr "由於不明的錯誤使連線機密的更新失敗。"